diff --git a/packages/builder/src/pages/builder/app/[application]/design/[assetType]/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[assetType]/index.svelte
index a767b56b4f..444835de22 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[assetType]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[assetType]/index.svelte
@@ -45,6 +45,14 @@
         store.actions.screens.select(id)
       }
     }
+
+    // If we didn't find a valid asset, just update the preview type
+    if (!id) {
+      store.update(state => {
+        state.currentFrontEndType = assetType
+        return state
+      })
+    }
   }
 </script>
 
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}