diff --git a/src/ComposedModal/ComposedModal.svelte b/src/ComposedModal/ComposedModal.svelte
index 6300d9d3..36aecf5d 100644
--- a/src/ComposedModal/ComposedModal.svelte
+++ b/src/ComposedModal/ComposedModal.svelte
@@ -36,7 +36,6 @@
     setContext,
     onMount,
     afterUpdate,
-    onDestroy,
   } from "svelte";
   import { writable } from "svelte/store";
 
@@ -73,13 +72,14 @@
   let opened = false;
   $: didOpen = open;
 
-  onMount(async () => {
-    await tick();
-    focus();
-  });
+  onMount(() => {
+    tick().then(() => {
+      focus();
+    });
 
-  onDestroy(() => {
-    document.body.classList.remove("bx--body--with-modal-open");
+    return () => {
+      document.body.classList.remove("bx--body--with-modal-open");
+    };
   });
 
   afterUpdate(() => {