diff --git a/src/lib/components/dialog/Dialog.svelte b/src/lib/components/dialog/Dialog.svelte
index fda270b..5977347 100644
--- a/src/lib/components/dialog/Dialog.svelte
+++ b/src/lib/components/dialog/Dialog.svelte
@@ -253,10 +253,11 @@
   onUpdate={(message, element) => {
     return match(message, {
       [StackMessage.Add]() {
-        containers.add(element);
+        containers = new Set([...containers, element]);
       },
       [StackMessage.Remove]() {
         containers.delete(element);
+        containers = new Set([...containers]);
       },
     });
   }}
diff --git a/src/lib/components/focus-trap/FocusTrap.svelte b/src/lib/components/focus-trap/FocusTrap.svelte
index af9dab3..d93f4dc 100644
--- a/src/lib/components/focus-trap/FocusTrap.svelte
+++ b/src/lib/components/focus-trap/FocusTrap.svelte
@@ -7,7 +7,7 @@
     FocusResult,
   } from "$lib/utils/focus-management";
   import { contains } from "$lib/internal/dom-containers";
-  import { afterUpdate, onMount, onDestroy, tick } from "svelte";
+  import { onMount, onDestroy, tick } from "svelte";
 
   export let containers: Set<HTMLElement>;
   export let enabled: boolean = true;
@@ -74,7 +74,7 @@
   // Handle initial focus
   onMount(handleFocus);
 
-  afterUpdate(() => (enabled ? handleFocus() : restore()));
+  $: enabled && containers ? handleFocus() : restore();
 
   // When this component is being destroyed, focusElement is called
   // before handleWindowFocus is removed, so in the svelte port we add this
diff --git a/src/lib/internal/StackContextProvider.svelte b/src/lib/internal/StackContextProvider.svelte
index eb74e75..51ba62b 100644
--- a/src/lib/internal/StackContextProvider.svelte
+++ b/src/lib/internal/StackContextProvider.svelte
@@ -9,24 +9,21 @@
 
 <script lang="ts">
   import { getContext, onDestroy, setContext } from "svelte";
-  import { Readable, writable, Writable } from "svelte/store";
   type OnUpdate = (message: StackMessage, element: HTMLElement) => void;
 
   export let onUpdate: OnUpdate | undefined;
   export let element: HTMLElement | null;
 
-  let parentUpdateStore: Readable<OnUpdate> | undefined =
-    getContext(STACK_CONTEXT_NAME);
-  let notifyStore: Writable<OnUpdate> = writable(() => {});
-  setContext(STACK_CONTEXT_NAME, notifyStore);
-
-  $: notifyStore.set((...args: Parameters<OnUpdate>) => {
+  function notify(...args: Parameters<OnUpdate>) {
     // Notify our layer
     onUpdate?.(...args);
 
     // Notify the parent
-    $parentUpdateStore?.(...args);
-  });
+    parentUpdate?.(...args);
+  }
+
+  let parentUpdate: OnUpdate | undefined = getContext(STACK_CONTEXT_NAME);
+  setContext(STACK_CONTEXT_NAME, notify);
 
   $: _cleanup = (() => {
     if (_cleanup) {
@@ -34,8 +31,8 @@
     }
     if (!element) return null;
     let savedElement = element;
-    $notifyStore(StackMessage.Add, savedElement);
-    return () => $notifyStore(StackMessage.Remove, savedElement);
+    notify(StackMessage.Add, savedElement);
+    return () => notify(StackMessage.Remove, savedElement);
   })();
 
   onDestroy(() => {