diff --git a/packages/client/src/components/app/container/GridContainer.svelte b/packages/client/src/components/app/container/GridContainer.svelte
index f9394415be..3ed99c1963 100644
--- a/packages/client/src/components/app/container/GridContainer.svelte
+++ b/packages/client/src/components/app/container/GridContainer.svelte
@@ -68,6 +68,16 @@
     position: relative;
     height: 400px;
     gap: 0;
+
+    /* Prevent cross-grid variable inheritance */
+    --grid-desktop-col-start: initial;
+    --grid-desktop-col-end: initial;
+    --grid-desktop-row-start: initial;
+    --grid-desktop-row-end: initial;
+    --grid-mobile-col-start: initial;
+    --grid-mobile-col-end: initial;
+    --grid-mobile-row-start: initial;
+    --grid-mobile-row-end: initial;
   }
   .grid,
   .underlay {