diff --git a/app/javascript/controllers/dialog_controller.js b/app/javascript/controllers/dialog_controller.js
index 145c16059..037c5ec7b 100644
--- a/app/javascript/controllers/dialog_controller.js
+++ b/app/javascript/controllers/dialog_controller.js
@@ -11,11 +11,14 @@ export default class extends Controller {
   }
 
   connect() {
-    this.#setupFocus()
     this.dialogTarget.setAttribute("aria-hidden", "true")
     if (this.autoOpenValue) this.open()
   }
 
+  focusTouchTargetConnected() {
+    this.#setupFocus()
+  }
+
   open() {
     const modal = this.modalValue