diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json
index 8ef0b63f24d7..dc632c166f1e 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json
@@ -98,7 +98,10 @@
           "exclude": [
             "BlazorWeb-CSharp/Components/Layout/ReconnectModal.razor",
             "BlazorWeb-CSharp/Components/Layout/ReconnectModal.razor.css",
-            "BlazorWeb-CSharp/Components/Layout/ReconnectModal.razor.js"
+            "BlazorWeb-CSharp/Components/Layout/ReconnectModal.razor.js",
+            "BlazorWeb-CSharp.Client/Layout/ReconnectModal.razor",
+            "BlazorWeb-CSharp.Client/Layout/ReconnectModal.razor.css",
+            "BlazorWeb-CSharp.Client/Layout/ReconnectModal.razor.js"
           ]
         },
         {
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor
index 103dbe4f50e9..3f3531f29052 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor
@@ -39,6 +39,9 @@
     ##else
     <Routes @rendermode="InteractiveWebAssembly" />
     ##endif*@
+    @*#if (UseServer)  -->
+    <ReconnectModal />
+    ##endif*@
     <script src="@Assets["_framework/blazor.web.js"]"></script>
 </body>
 
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/MainLayout.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/MainLayout.razor
index dff2f7ff2e66..998fa68bafd4 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/MainLayout.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/MainLayout.razor
@@ -28,6 +28,3 @@
     <span class="dismiss">🗙</span>
 </div>
 ##endif*@
-@*#if (UseServer)  -->
-<ReconnectModal />
-##endif*@
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/ReconnectModal.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/ReconnectModal.razor
index f0ec3e37f06a..277e7f8f8bb7 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/ReconnectModal.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/ReconnectModal.razor
@@ -1,4 +1,8 @@
-<script type="module" src="@Assets["Components/Layout/ReconnectModal.razor.js"]"></script>
+@*#if (UseWebAssembly && InteractiveAtRoot) -->
+<script type="module" src="@Assets["Layout/ReconnectModal.razor.js"]"></script>
+##else
+<script type="module" src="@Assets["Components/Layout/ReconnectModal.razor.js"]"></script>
+##endif*@
 
 <dialog id="components-reconnect-modal" data-nosnippet>
     <div class="components-reconnect-container">
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/_Imports.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/_Imports.razor
index b739f3ba372a..d73d6a9c9820 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/_Imports.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/_Imports.razor
@@ -13,4 +13,10 @@
 @*#if (UseWebAssembly) -->
 @using BlazorWeb_CSharp.Client
 ##endif*@
+@*#if (UseServer && UseWebAssembly && InteractiveAtRoot) -->
+@using BlazorWeb_CSharp.Client.Layout
+##endif*@
 @using BlazorWeb_CSharp.Components
+@*#if (UseServer && (!UseWebAssembly || !InteractiveAtRoot)) -->
+@using BlazorWeb_CSharp.Components.Layout
+##endif*@