diff --git a/default.hbs b/default.hbs
index 56db51d..fc7c639 100644
--- a/default.hbs
+++ b/default.hbs
@@ -40,13 +40,12 @@
     hx-select="#viewport"
 >
     
-    {{!-- The Mobile Menu is outside the swap target and stays alive --}}
-    {{> mobile-menu}}
-
     {{!-- 
         This container is the target for HTMX swaps. 
+        Moving everything inside ensures navigation highlights and states update on every click.
     --}}
     <div id="viewport" class="min-h-screen flex flex-col">
+        {{> mobile-menu}}
         {{> header}}
 
         <main class="flex-grow">
diff --git a/partials/mobile-menu.hbs b/partials/mobile-menu.hbs
index 38c823f..d439472 100644
--- a/partials/mobile-menu.hbs
+++ b/partials/mobile-menu.hbs
@@ -1,5 +1,4 @@
 <div id="mobile-menu" 
-    hx-preserve
     x-show="mobileMenuOpen"
     x-transition:enter="transition ease-out duration-300"
     x-transition:enter-start="-translate-x-full"