diff --git a/src/js/components/Modal/index.svelte b/src/js/components/Modal/index.svelte
index 3db54ec..7c5b56f 100644
--- a/src/js/components/Modal/index.svelte
+++ b/src/js/components/Modal/index.svelte
@@ -35,6 +35,7 @@
     focusHelpOnClose = false,
     focusMyAccountOnClose = false,
     focusButtonOnClose = false,
+    focusDownloadOnClose = false,
     title,
     body,
     footer,
@@ -59,7 +60,7 @@
     }
     isOpen = true;
     dialog.showModal();
-    if (focusHelpOnClose || focusMyAccountOnClose || focusButtonOnClose) {
+    if (focusHelpOnClose || focusMyAccountOnClose || focusButtonOnClose || focusDownloadOnClose) {
       window.addEventListener('keydown', logKeys);
     }
   };
@@ -86,6 +87,9 @@
     if (focusButtonOnClose) {
       document.querySelector('#feedback-form').focus();
     }
+    if (focusDownloadOnClose) {
+      setTimeout(() => {document.getElementById('submit-download').focus();}, 100)
+    }
   };
 
   onMount(() => {