diff --git a/src/ComposedModal/ComposedModal.svelte b/src/ComposedModal/ComposedModal.svelte
index f0991bd6..29b2dbce 100644
--- a/src/ComposedModal/ComposedModal.svelte
+++ b/src/ComposedModal/ComposedModal.svelte
@@ -90,7 +90,6 @@
 <div
   bind:this="{ref}"
   role="presentation"
-  tabindex="-1"
   class:bx--modal="{true}"
   class:is-visible="{open}"
   class:bx--modal--danger="{danger}"
diff --git a/src/Modal/Modal.svelte b/src/Modal/Modal.svelte
index 3bc66644..09616b78 100644
--- a/src/Modal/Modal.svelte
+++ b/src/Modal/Modal.svelte
@@ -127,7 +127,6 @@
 <div
   bind:this="{ref}"
   role="presentation"
-  tabindex="-1"
   id="{id}"
   class:bx--modal="{true}"
   class:bx--modal-tall="{!passiveModal}"
@@ -156,6 +155,7 @@
   <div
     bind:this="{innerModal}"
     role="dialog"
+    tabindex="-1"
     {...alertDialogProps}
     aria-modal="true"
     aria-label="{ariaLabel}"