diff --git a/src/Modal/Modal.svelte b/src/Modal/Modal.svelte
index 48844caf..5f385879 100644
--- a/src/Modal/Modal.svelte
+++ b/src/Modal/Modal.svelte
@@ -17,7 +17,7 @@
   export let id = "ccs-" + Math.random().toString(36);
   export let ref = null;
 
-  import { createEventDispatcher, afterUpdate, onDestroy } from "svelte";
+  import { createEventDispatcher, onMount, afterUpdate } from "svelte";
   import Close20 from "carbon-icons-svelte/lib/Close20";
   import { Button } from "../Button";
 
@@ -33,6 +33,12 @@
     node.focus();
   }
 
+  onMount(() => {
+    return () => {
+      document.body.classList.remove("bx--body--with-modal-open");
+    };
+  });
+
   afterUpdate(() => {
     if (opened) {
       if (!open) {
@@ -48,10 +54,6 @@
     }
   });
 
-  onDestroy(() => {
-    document.body.classList.remove("bx--body--with-modal-open");
-  });
-
   $: modalLabelId = `bx--modal-header__label--modal-${id}`;
   $: modalHeadingId = `bx--modal-header__heading--modal-${id}`;
   $: ariaLabel =