From 295d9d16fc493c84c043c9d1c89be6244a785682 Mon Sep 17 00:00:00 2001
From: Aaron Iker <aaron@ease.dev>
Date: Thu, 8 Jan 2026 03:13:06 +0100
Subject: [PATCH] fix: toolbar context reactivity

---
 packages/app/src/pages/directory-layout.tsx | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/packages/app/src/pages/directory-layout.tsx b/packages/app/src/pages/directory-layout.tsx
index 740c905ff8..87e6cfbc76 100644
--- a/packages/app/src/pages/directory-layout.tsx
+++ b/packages/app/src/pages/directory-layout.tsx
@@ -1,4 +1,4 @@
-import { createMemo, Show, type ParentProps } from "solid-js"
+import { createMemo, createSignal, onMount, Show, type ParentProps } from "solid-js"
 import { Portal } from "solid-js/web"
 import { useNavigate, useParams } from "@solidjs/router"
 import { SDKProvider, useSDK } from "@/context/sdk"
@@ -34,14 +34,23 @@ export default function Layout(props: ParentProps) {
               navigate(`/${params.dir}/session/${sessionID}`)
             }
 
-            const portalMount = document.getElementById(TOOLBAR_PORTAL_ID)
+            const [portalMount, setPortalMount] = createSignal<HTMLElement | null>(null)
+            onMount(() => {
+              setPortalMount(document.getElementById(TOOLBAR_PORTAL_ID))
+            })
+
+            const toolbarKey = createMemo(() => params.id ?? "new")
 
             return (
               <>
-                <Show when={portalMount}>
-                  <Portal mount={portalMount!}>
-                    <ToolbarSession />
-                  </Portal>
+                <Show when={portalMount()}>
+                  {(mount) => (
+                    <Portal mount={mount()}>
+                      <Show when={toolbarKey()} keyed>
+                        <ToolbarSession />
+                      </Show>
+                    </Portal>
+                  )}
                 </Show>
                 <DataProvider
                   data={sync.data}