diff --git a/packages/app-shell/src/app-shell.js b/packages/app-shell/src/app-shell.js
index e3c67977662660ca53b60547f7d715a0cfe5dbfa..4e10b8486abbbb1522495db5543cbe34297c7dfb 100644
--- a/packages/app-shell/src/app-shell.js
+++ b/packages/app-shell/src/app-shell.js
@@ -306,7 +306,7 @@ export class AppShell extends ScopedElementsMixin(LitElement) {
         const link = e.composedPath()[0];
         const location = link.getAttribute('href');
         this.router.updateFromPathname(location);
-        this.toggleMenu();
+        this.hideMenu();
     }
 
     onLanguageChanged(e) {
@@ -383,6 +383,12 @@ export class AppShell extends ScopedElementsMixin(LitElement) {
         }
     }
 
+    hideMenu() {
+        const menu = this.shadowRoot.querySelector("ul.menu");
+        if (menu && !menu.classList.contains('hidden'))
+            this.toggleMenu();
+    }
+
     static get styles() {
         // language=css
         return css`
@@ -725,7 +731,7 @@ export class AppShell extends ScopedElementsMixin(LitElement) {
                     </h2>
                     <ul class="menu hidden">
                         ${menuTemplates}
-                        <li class="close" @click="${this.toggleMenu}"><vpu-icon name="close" style="color: red"></vpu-icon></li>
+                        <li class="close" @click="${this.hideMenu}"><vpu-icon name="close" style="color: red"></vpu-icon></li>
                     </ul>
                 </aside>