diff --git a/default.hbs b/default.hbs
index 61d73fe..56db51d 100644
--- a/default.hbs
+++ b/default.hbs
@@ -34,16 +34,19 @@
     {{ghost_head}}
 </head>
 <body 
-    class="{{body_class}} font-sans antialiased">
+    class="{{body_class}} font-sans antialiased"
+    hx-boost="true"
+    hx-target="#viewport"
+    hx-select="#viewport"
+>
     
     {{!-- The Mobile Menu is outside the swap target and stays alive --}}
     {{> mobile-menu}}
 
     {{!-- 
-        We target only this container for HTMX page swaps. 
-        This keeps root Alpine state (like mobileMenuOpen) persistent.
+        This container is the target for HTMX swaps. 
     --}}
-    <div id="viewport" class="min-h-screen flex flex-col" hx-boost="true" hx-target="#viewport" hx-select="#viewport">
+    <div id="viewport" class="min-h-screen flex flex-col">
         {{> header}}
 
         <main class="flex-grow">
