diff --git a/src/Templates/src/templates/maui-blazor-solution/.template.config/template.json b/src/Templates/src/templates/maui-blazor-solution/.template.config/template.json
index 0254c7879659..2e3cbeb02fae 100644
--- a/src/Templates/src/templates/maui-blazor-solution/.template.config/template.json
+++ b/src/Templates/src/templates/maui-blazor-solution/.template.config/template.json
@@ -65,7 +65,8 @@
       "copyOnly": [
         "**/wwwroot/lib/bootstrap/**",
         "**/*.svg",
-        "**/*.ttf"
+        "**/*.ttf",
+        "**/*.razor.js"
       ],
       "modifiers": [
         {
@@ -289,7 +290,10 @@
         "sourceVariableName": "kestrelHttpPort",
         "fallbackVariableName": "kestrelHttpPortGenerated"
       },
-      "replaces": "5500"
+      "replaces": "5500",
+      "onlyIf": [{
+        "after": "localhost:"
+      }]
     },
     "kestrelHttpsPort": {
       "type": "parameter",
@@ -311,7 +315,10 @@
         "sourceVariableName": "kestrelHttpsPort",
         "fallbackVariableName": "kestrelHttpsPortGenerated"
       },
-      "replaces": "5501"
+      "replaces": "5501",
+      "onlyIf": [{
+        "after": "localhost:"
+      }]
     },
     "iisHttpPort": {
       "type": "parameter",
diff --git a/src/Templates/src/templates/maui-blazor-solution/MauiApp.1.Shared/Layout/NavMenu.razor b/src/Templates/src/templates/maui-blazor-solution/MauiApp.1.Shared/Layout/NavMenu.razor
index 0f946f9fccef..278de4ae610c 100644
--- a/src/Templates/src/templates/maui-blazor-solution/MauiApp.1.Shared/Layout/NavMenu.razor
+++ b/src/Templates/src/templates/maui-blazor-solution/MauiApp.1.Shared/Layout/NavMenu.razor
@@ -4,6 +4,7 @@
 @inject NavigationManager NavigationManager
 
 ##endif*@
+@* NavMenu.razor.js is also loaded early from index.html so the document-level delegated collapse handler is ready before Hybrid renders this menu (no SSR prerender). The module is idempotent via globalThis.__mauiNavMenuCollapseInitialized, so listeners register once. *@
 <script type="module" src="_content/MauiApp.1.Shared/Layout/NavMenu.razor.js"></script>
 
 <div class="top-row ps-3 navbar navbar-dark">
diff --git a/src/Templates/src/templates/maui-blazor-solution/MauiApp.1.Shared/Layout/NavMenu.razor.js b/src/Templates/src/templates/maui-blazor-solution/MauiApp.1.Shared/Layout/NavMenu.razor.js
index 2ad21bdb4852..174266044f43 100644
--- a/src/Templates/src/templates/maui-blazor-solution/MauiApp.1.Shared/Layout/NavMenu.razor.js
+++ b/src/Templates/src/templates/maui-blazor-solution/MauiApp.1.Shared/Layout/NavMenu.razor.js
@@ -1,9 +1,16 @@
 // Handle navigation menu toggle
-const navScrollable = document.getElementById("nav-scrollable");
-const navToggler = document.querySelector(".navbar-toggler");
+if (!globalThis.__mauiNavMenuCollapseInitialized) {
+    globalThis.__mauiNavMenuCollapseInitialized = true;
 
-if (navScrollable && navToggler) {
-    navScrollable.addEventListener("click", function() {
-        navToggler.click();
+    document.addEventListener("click", function(event) {
+        const target = event.target;
+
+        if (target instanceof Element && target.closest("#nav-scrollable")) {
+            const navToggler = document.querySelector(".navbar-toggler");
+
+            if (navToggler instanceof HTMLInputElement && navToggler.checked) {
+                navToggler.click();
+            }
+        }
     });
 }
diff --git a/src/Templates/src/templates/maui-blazor-solution/MauiApp.1.Web.Client/MauiApp.1.Web.Client.csproj b/src/Templates/src/templates/maui-blazor-solution/MauiApp.1.Web.Client/MauiApp.1.Web.Client.csproj
index 1bc7b21155cb..6a445b0ea71e 100644
--- a/src/Templates/src/templates/maui-blazor-solution/MauiApp.1.Web.Client/MauiApp.1.Web.Client.csproj
+++ b/src/Templates/src/templates/maui-blazor-solution/MauiApp.1.Web.Client/MauiApp.1.Web.Client.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="MS_COMPONENTS_WEBASSEMBLY_VERSION" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.0" Condition="'$(IndividualLocalAuth)' == 'True'" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="MS_COMPONENTS_WEBASSEMBLY_VERSION" Condition="'$(IndividualLocalAuth)' == 'True'" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Templates/src/templates/maui-blazor-solution/MauiApp.1.Web.Client/Program.Main.cs b/src/Templates/src/templates/maui-blazor-solution/MauiApp.1.Web.Client/Program.Main.cs
index b3f43b093aef..0e8b7522468f 100644
--- a/src/Templates/src/templates/maui-blazor-solution/MauiApp.1.Web.Client/Program.Main.cs
+++ b/src/Templates/src/templates/maui-blazor-solution/MauiApp.1.Web.Client/Program.Main.cs
@@ -20,7 +20,7 @@ static async Task Main(string[] args)
         #if (IndividualLocalAuth)
         builder.Services.AddAuthorizationCore();
         builder.Services.AddCascadingAuthenticationState();
-        builder.Services.AddSingleton<AuthenticationStateProvider, PersistentAuthenticationStateProvider>();
+        builder.Services.AddAuthenticationStateDeserialization();
 
         #endif
         await builder.Build().RunAsync();
diff --git a/src/Templates/src/templates/maui-blazor-solution/MauiApp.1.Web.Client/Program.cs b/src/Templates/src/templates/maui-blazor-solution/MauiApp.1.Web.Client/Program.cs
index 2f33fefcbf6a..03b60f96155e 100644
--- a/src/Templates/src/templates/maui-blazor-solution/MauiApp.1.Web.Client/Program.cs
+++ b/src/Templates/src/templates/maui-blazor-solution/MauiApp.1.Web.Client/Program.cs
@@ -14,7 +14,7 @@
 #if (IndividualLocalAuth)
 builder.Services.AddAuthorizationCore();
 builder.Services.AddCascadingAuthenticationState();
-builder.Services.AddSingleton<AuthenticationStateProvider, PersistentAuthenticationStateProvider>();
+builder.Services.AddAuthenticationStateDeserialization();
 
 #endif
 await builder.Build().RunAsync();
diff --git a/src/Templates/src/templates/maui-blazor-solution/MauiApp.1.Web/Components/Layout/ReconnectModal.razor b/src/Templates/src/templates/maui-blazor-solution/MauiApp.1.Web/Components/Layout/ReconnectModal.razor
index a85217a1132b..44f63561f43a 100644
--- a/src/Templates/src/templates/maui-blazor-solution/MauiApp.1.Web/Components/Layout/ReconnectModal.razor
+++ b/src/Templates/src/templates/maui-blazor-solution/MauiApp.1.Web/Components/Layout/ReconnectModal.razor
@@ -25,11 +25,11 @@
         <p class="components-pause-visible">
             The session has been paused by the server.
         </p>
-        <button id="components-resume-button" class="components-pause-visible">
-            Resume
-        </button>
         <p class="components-resume-failed-visible">
-            Failed to resume the session.<br />Please reload the page.
+            Failed to resume the session.<br />Please retry or reload the page.
         </p>
+        <button id="components-resume-button" class="components-pause-visible components-resume-failed-visible">
+            Resume
+        </button>
     </div>
 </dialog>
diff --git a/src/Templates/src/templates/maui-blazor-solution/MauiApp.1.Web/Components/Layout/ReconnectModal.razor.css b/src/Templates/src/templates/maui-blazor-solution/MauiApp.1.Web/Components/Layout/ReconnectModal.razor.css
index 3ad3773f39db..77e79175b2bb 100644
--- a/src/Templates/src/templates/maui-blazor-solution/MauiApp.1.Web/Components/Layout/ReconnectModal.razor.css
+++ b/src/Templates/src/templates/maui-blazor-solution/MauiApp.1.Web/Components/Layout/ReconnectModal.razor.css
@@ -31,13 +31,10 @@
     opacity: 0;
     transition: display 0.5s allow-discrete, overlay 0.5s allow-discrete;
     animation: components-reconnect-modal-fadeOutOpacity 0.5s both;
-    &[open]
-
-{
-    animation: components-reconnect-modal-slideUp 1.5s cubic-bezier(.05, .89, .25, 1.02) 0.3s, components-reconnect-modal-fadeInOpacity 0.5s ease-in-out 0.3s;
-    animation-fill-mode: both;
-}
-
+    &[open] {
+        animation: components-reconnect-modal-slideUp 1.5s cubic-bezier(.05, .89, .25, 1.02) 0.3s, components-reconnect-modal-fadeInOpacity 0.5s ease-in-out 0.3s;
+        animation-fill-mode: both;
+    }
 }
 
 #components-reconnect-modal::backdrop {
diff --git a/src/Templates/src/templates/maui-blazor-solution/MauiApp.1.Web/Components/Layout/ReconnectModal.razor.js b/src/Templates/src/templates/maui-blazor-solution/MauiApp.1.Web/Components/Layout/ReconnectModal.razor.js
index e52a190bacbb..a44de78d836d 100644
--- a/src/Templates/src/templates/maui-blazor-solution/MauiApp.1.Web/Components/Layout/ReconnectModal.razor.js
+++ b/src/Templates/src/templates/maui-blazor-solution/MauiApp.1.Web/Components/Layout/ReconnectModal.razor.js
@@ -52,7 +52,7 @@ async function resume() {
             location.reload();
         }
     } catch {
-        location.reload();
+        reconnectModal.classList.replace("components-reconnect-paused", "components-reconnect-resume-failed");
     }
 }
 
diff --git a/src/Templates/src/templates/maui-blazor-solution/MauiApp.1/wwwroot/index.html b/src/Templates/src/templates/maui-blazor-solution/MauiApp.1/wwwroot/index.html
index 95bdeebf0c9a..6fdb4e39525c 100644
--- a/src/Templates/src/templates/maui-blazor-solution/MauiApp.1/wwwroot/index.html
+++ b/src/Templates/src/templates/maui-blazor-solution/MauiApp.1/wwwroot/index.html
@@ -21,6 +21,10 @@
     <div id="app">Loading...</div>
 
     <script src="_framework/blazor.webview.js" autostart="false"></script>
+<!--#if (SampleContent) -->
+    <!-- NavMenu.razor.js is also loaded by NavMenu.razor; this early load registers the document-level delegated collapse handler before Hybrid renders the menu (no SSR prerender). The module is idempotent via globalThis.__mauiNavMenuCollapseInitialized, so listeners register once. -->
+    <script type="module" src="_content/MauiApp.1.Shared/Layout/NavMenu.razor.js"></script>
+<!--#endif -->
 
 </body>
 
diff --git a/src/Templates/src/templates/maui-blazor/.template.config/template.json b/src/Templates/src/templates/maui-blazor/.template.config/template.json
index 94d323cf9e67..f92039123c61 100644
--- a/src/Templates/src/templates/maui-blazor/.template.config/template.json
+++ b/src/Templates/src/templates/maui-blazor/.template.config/template.json
@@ -52,7 +52,8 @@
       "copyOnly": [
         "**/wwwroot/lib/bootstrap/**",
         "**/*.svg",
-        "**/*.ttf"
+        "**/*.ttf",
+        "**/*.razor.js"
       ],
       "modifiers": [
         {
diff --git a/src/Templates/src/templates/maui-blazor/Components/Layout/NavMenu.razor b/src/Templates/src/templates/maui-blazor/Components/Layout/NavMenu.razor
index 5934a7f29966..b854f1613107 100644
--- a/src/Templates/src/templates/maui-blazor/Components/Layout/NavMenu.razor
+++ b/src/Templates/src/templates/maui-blazor/Components/Layout/NavMenu.razor
@@ -1,4 +1,5 @@
-<script type="module" src="Components/Layout/NavMenu.razor.js"></script>
+@* NavMenu.razor.js is also loaded early from index.html so the document-level delegated collapse handler is ready before Hybrid renders this menu (no SSR prerender). The module is idempotent via globalThis.__mauiNavMenuCollapseInitialized, so listeners register once. *@
+<script type="module" src="Components/Layout/NavMenu.razor.js"></script>
 
 <div class="top-row ps-3 navbar navbar-dark">
     <div class="container-fluid">
diff --git a/src/Templates/src/templates/maui-blazor/Components/Layout/NavMenu.razor.js b/src/Templates/src/templates/maui-blazor/Components/Layout/NavMenu.razor.js
index 2ad21bdb4852..174266044f43 100644
--- a/src/Templates/src/templates/maui-blazor/Components/Layout/NavMenu.razor.js
+++ b/src/Templates/src/templates/maui-blazor/Components/Layout/NavMenu.razor.js
@@ -1,9 +1,16 @@
 // Handle navigation menu toggle
-const navScrollable = document.getElementById("nav-scrollable");
-const navToggler = document.querySelector(".navbar-toggler");
+if (!globalThis.__mauiNavMenuCollapseInitialized) {
+    globalThis.__mauiNavMenuCollapseInitialized = true;
 
-if (navScrollable && navToggler) {
-    navScrollable.addEventListener("click", function() {
-        navToggler.click();
+    document.addEventListener("click", function(event) {
+        const target = event.target;
+
+        if (target instanceof Element && target.closest("#nav-scrollable")) {
+            const navToggler = document.querySelector(".navbar-toggler");
+
+            if (navToggler instanceof HTMLInputElement && navToggler.checked) {
+                navToggler.click();
+            }
+        }
     });
 }
diff --git a/src/Templates/src/templates/maui-blazor/wwwroot/index.html b/src/Templates/src/templates/maui-blazor/wwwroot/index.html
index 5eca68ef87e5..6cd92e73adfc 100644
--- a/src/Templates/src/templates/maui-blazor/wwwroot/index.html
+++ b/src/Templates/src/templates/maui-blazor/wwwroot/index.html
@@ -26,6 +26,10 @@
     </div>
 
     <script src="_framework/blazor.webview.js" autostart="false"></script>
+<!--#if (SampleContent) -->
+    <!-- NavMenu.razor.js is also loaded by NavMenu.razor; this early load registers the document-level delegated collapse handler before Hybrid renders the menu (no SSR prerender). The module is idempotent via globalThis.__mauiNavMenuCollapseInitialized, so listeners register once. -->
+    <script type="module" src="Components/Layout/NavMenu.razor.js"></script>
+<!--#endif -->
 
 </body>