diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte
index b790ecd0d4..c1bdc92ac4 100644
--- a/packages/client/src/components/ClientApp.svelte
+++ b/packages/client/src/components/ClientApp.svelte
@@ -19,6 +19,7 @@
     devToolsStore,
     devToolsEnabled,
     environmentStore,
+    sidePanelStore,
   } from "stores"
   import NotificationDisplay from "components/overlay/NotificationDisplay.svelte"
   import ConfirmationDisplay from "components/overlay/ConfirmationDisplay.svelte"
@@ -102,6 +103,16 @@
         embedded: !!$appStore.embedded,
       })
     }
+    const handleHashChange = () => {
+      const { open } = $sidePanelStore
+      if (open) {
+        sidePanelStore.actions.close()
+      }
+    }
+    window.addEventListener("hashchange", handleHashChange)
+    return () => {
+      window.removeEventListener("hashchange", handleHashChange)
+    }
   })
 
   $: {
diff --git a/packages/client/src/components/app/SidePanel.svelte b/packages/client/src/components/app/SidePanel.svelte
index bff5a78837..d49ab33c40 100644
--- a/packages/client/src/components/app/SidePanel.svelte
+++ b/packages/client/src/components/app/SidePanel.svelte
@@ -29,10 +29,6 @@
     }
   }
 
-  // $: {
-
-  // }
-
   // Derive visibility
   $: open = $sidePanelStore.contentId === $component.id