diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte
index 5bd5d2d46f..06b240f3ee 100644
--- a/packages/client/src/components/ClientApp.svelte
+++ b/packages/client/src/components/ClientApp.svelte
@@ -108,7 +108,7 @@
               <!-- Actual app -->
               <div id="app-root">
                 <CustomThemeWrapper>
-                  {#key $screenStore.activeLayout._id}
+                  {#key `${$screenStore.activeLayout._id}-${$builderStore.previewType}`}
                     <Component
                       isLayout
                       instance={$screenStore.activeLayout.props}