diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte
index 118aa483ab..516f505d21 100644
--- a/packages/client/src/components/ClientApp.svelte
+++ b/packages/client/src/components/ClientApp.svelte
@@ -235,9 +235,6 @@
                               />
                             {/key}
 
-                            <!-- Modal container to ensure they sit on top -->
-                            <div class="modal-container" />
-
                             <!-- Layers on top of app -->
                             <NotificationDisplay />
                             <ConfirmationDisplay />
diff --git a/packages/client/src/components/app/Layout.svelte b/packages/client/src/components/app/Layout.svelte
index 76634d2df3..2426aeaed9 100644
--- a/packages/client/src/components/app/Layout.svelte
+++ b/packages/client/src/components/app/Layout.svelte
@@ -339,6 +339,7 @@
         />
       </div>
     </div>
+    <div class="modal-container" />
   </div>
 </div>