diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/index.svelte
index 21020cc097..d1a5df68e1 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/index.svelte
@@ -1,7 +1,10 @@
 <script>
+  import { selectedScreen } from "builderStore"
   import ScreenListPanel from "./_components/ScreenListPanel.svelte"
   import ScreenSettingsPanel from "./_components/ScreenSettingsPanel.svelte"
 </script>
 
 <ScreenListPanel />
-<ScreenSettingsPanel />
+{#key $selectedScreen?._id}
+  <ScreenSettingsPanel />
+{/key}