diff --git a/docs/_includes/layout-templates/app.html.njk b/docs/_includes/layout-templates/app.html.njk
index 7784b3287..576d751ea 100644
--- a/docs/_includes/layout-templates/app.html.njk
+++ b/docs/_includes/layout-templates/app.html.njk
@@ -1,6 +1,6 @@
 <wa-layout main-id="main-content" class="wa-theme-light">
   <header slot="header">
-    <wa-icon-button name="list" style="font-size: 1.5rem" onclick="this.closest('wa-layout').showNavigation()"></wa-icon>
+    <wa-icon-button name="list" style="font-size: 1.5rem" data-wa-layout-toggle-navigation></wa-icon>
   </header>
   <wa-button href="#" variant="text" style="padding: 0 0.4rem" class="wa-button--logo wa-button--stretch wa-button--muted" size="large" slot="navigation-header">
     <wa-icon name="music-note" slot="prefix" style="font-size: 2rem;"></wa-icon>
diff --git a/src/components/layout/layout.component.ts b/src/components/layout/layout.component.ts
index 14c077d0a..4e670f831 100644
--- a/src/components/layout/layout.component.ts
+++ b/src/components/layout/layout.component.ts
@@ -131,6 +131,22 @@ export default class WaLayout extends WebAwesomeElement {
   @query("[part~='banner']") banner: HTMLElement;
   @query("[part~='navigation-drawer']") navigationDrawer: WaDrawer;
 
+
+  handleNavigationToggle = (e: Event) => {
+    e.preventDefault()
+
+    if (e.composedPath().find((el: Element) => el?.hasAttribute("data-wa-layout-toggle-navigation"))) {
+      this.toggleNavigation()
+    }
+  }
+
+  constructor () {
+    super()
+
+    this.addEventListener("click", this.handleNavigationToggle)
+  }
+
+
   connectedCallback() {
     super.connectedCallback();
 
@@ -241,7 +257,24 @@ export default class WaLayout extends WebAwesomeElement {
         </div>
       </div>
 
-      <wa-drawer placement=${this.navigationPlacement} part="navigation-drawer" exportparts="panel:drawer__panel" class="navigation-drawer">
+      <wa-drawer
+        placement=${this.navigationPlacement}
+        part="drawer"
+        exportparts="
+          panel:drawer__panel
+          base:drawer__base
+          overlay:drawer__overlay
+          panel:drawer__panel
+          header:drawer__header
+          header-actions:drawer__header-actions
+          title:drawer__title
+          close-button:drawer__close-button
+          close-button__base:drawer__close-button__base
+          body:drawer__body
+          footer:drawer__footer
+        "
+        class="navigation-drawer"
+      >
         <slot slot="label" name=${this.view === 'mobile' ? 'navigation-header' : '___'}></slot>
         <slot name=${this.view === 'mobile' ? 'navigation' : '____'}></slot>
         <slot slot="footer" name=${this.view === 'mobile' ? 'navigation-footer' : '___'}></slot>