diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index f6a7e125..dd613344 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -1,6 +1,6 @@
 <template>
     <!-- Modal -->
-    <focus-trap v-model:active="isOpen">
+    <focus-trap v-model:active="isOpen" :fallbackFocus="getFocusFallback">
     <div
         :id="modalId"
         class="modal fade modal-component"
@@ -123,10 +123,7 @@ export default {
         openModal() {
             const modal = Modal.getOrCreateInstance(document.getElementById(this.modalId));
             modal?.show();
-            setTimeout(() => {
-                this.isOpen = true;
-            }, 10);
-
+            this.isOpen = true;
             this.$emit('isModalOpened', true);
         },
         closeModal() {
@@ -134,6 +131,9 @@ export default {
             modal?.hide();
             this.isOpen = false;
             this.$emit('isModalOpened', false);
+        },
+        getFocusFallback() {
+            return this.$refs.modalButtonMain;
         }
     }
 };