diff --git a/assets/search/js/form.ts b/assets/search/js/form.ts
index 4e7e971f5ef..8445c5116bb 100644
--- a/assets/search/js/form.ts
+++ b/assets/search/js/form.ts
@@ -282,6 +282,7 @@ export default class Form {
     }
 
     private submit() {
+        this.input.disabled = true
         const query = this.getQuery()
         this.updatePage(query)
 
@@ -306,6 +307,8 @@ export default class Form {
                 Historiographer.save(query)
             }
             this.spinner.hide()
+            this.input.disabled = false
+            this.focus()
         })
     }