diff --git a/app/javascript/elements/search_input.js b/app/javascript/elements/search_input.js
index 502e2b3a..585f7122 100644
--- a/app/javascript/elements/search_input.js
+++ b/app/javascript/elements/search_input.js
@@ -15,13 +15,11 @@ export default class extends HTMLElement {
     })
 
     this.button.addEventListener('click', (event) => {
-      event.preventDefault()
+      if (!this.input.value && document.activeElement !== this.input) {
+        event.preventDefault()
 
-      if (this.input.value || document.activeElement === this.input) {
-        return
+        this.input.focus()
       }
-
-      this.input.focus()
     })
   }