diff --git a/frontend/app/components/modal.hbs b/frontend/app/components/modal.hbs
index b966760b..c31a06f4 100644
--- a/frontend/app/components/modal.hbs
+++ b/frontend/app/components/modal.hbs
@@ -3,7 +3,7 @@
     <Modal::Overlay
       @visible={{@visible}}
       @onClose={{optional @onClose}}
-      {{focus-trap}}
+      {{focus-trap additionalElements=(array this.target)}}
     >
       <div
         class="modal-dialog bg-background z-50 max-h-[100%] w-full rounded border"