diff --git a/src/assets/javascripts/controllers/autosubmit_controller.js b/src/assets/javascripts/controllers/autosubmit_controller.js
index 409a62e2c..ed2cc3fc5 100644
--- a/src/assets/javascripts/controllers/autosubmit_controller.js
+++ b/src/assets/javascripts/controllers/autosubmit_controller.js
@@ -6,6 +6,10 @@ export default class extends Controller {
         timeout: Number,
     };
 
+    static get targets () {
+        return ['actionButton'];
+    }
+
     connect () {
         if (this.modeValue === 'timeout') {
             let timeout;
@@ -23,5 +27,9 @@ export default class extends Controller {
 
     submit () {
         this.element.submit();
+
+        if (this.hasActionButtonTarget) {
+            this.actionButtonTarget.disabled = true;
+        }
     }
 };
diff --git a/src/views/_layouts/not_connected.phtml b/src/views/_layouts/not_connected.phtml
index 08ddfb292..41e15d377 100644
--- a/src/views/_layouts/not_connected.phtml
+++ b/src/views/_layouts/not_connected.phtml
@@ -115,6 +115,7 @@
                                     id="locale"
                                     name="locale"
                                     data-action="autosubmit#submit"
+                                    data-autosubmit-target="actionButton"
                                 >
                                     <?php foreach ($available_locales as $locale_value => $locale_name): ?>
                                         <option
diff --git a/src/views/collections/images/edit.phtml b/src/views/collections/images/edit.phtml
index 6c455946c..6b5210e9c 100644
--- a/src/views/collections/images/edit.phtml
+++ b/src/views/collections/images/edit.phtml
@@ -48,6 +48,7 @@
                 type="button"
                 class="button--primary"
                 data-action="form-file#openFile"
+                data-autosubmit-target="actionButton"
                 aria-describedby="file-desc"
             >
                 <?= _('Upload an image') ?>
diff --git a/src/views/importations/opml/show.phtml b/src/views/importations/opml/show.phtml
index 431fce933..986107057 100644
--- a/src/views/importations/opml/show.phtml
+++ b/src/views/importations/opml/show.phtml
@@ -92,6 +92,7 @@
                     class="button--primary"
                     data-action="form-file#openFile"
                     aria-describedby="opml-desc"
+                    data-autosubmit-target="actionButton"
                 >
                     <?= _('Import a file') ?>
                 </button>
diff --git a/src/views/links/searches/show.phtml b/src/views/links/searches/show.phtml
index 9d7b28c8f..72c043b0e 100644
--- a/src/views/links/searches/show.phtml
+++ b/src/views/links/searches/show.phtml
@@ -51,7 +51,11 @@
                     aria-describedby="url-desc"
                 />
 
-                <button type="submit" class="button--primary no-mobile">
+                <button
+                    type="submit"
+                    class="button--primary no-mobile"
+                    data-autosubmit-target="actionButton"
+                >
                     <?= _('Search') ?>
                 </button>
             </div>
diff --git a/src/views/my/profile/edit.phtml b/src/views/my/profile/edit.phtml
index b2c4df9e6..51dbe7d43 100644
--- a/src/views/my/profile/edit.phtml
+++ b/src/views/my/profile/edit.phtml
@@ -44,6 +44,7 @@
                 type="button"
                 class="button--small"
                 data-action="form-file#openFile"
+                data-autosubmit-target="actionButton"
                 aria-describedby="avatar-desc"
             >
                 <?= _('Upload a photo') ?>
diff --git a/src/views/onboarding/step1.phtml b/src/views/onboarding/step1.phtml
index ad41145d0..23f6058fc 100644
--- a/src/views/onboarding/step1.phtml
+++ b/src/views/onboarding/step1.phtml
@@ -30,6 +30,7 @@
                 id="locale"
                 name="locale"
                 data-action="autosubmit#submit"
+                data-autosubmit-target="actionButton"
             >
                 <?php foreach ($available_locales as $locale_value => $locale_name): ?>
                     <option