diff --git a/web-src/src/pages/PageSearchLibrary.vue b/web-src/src/pages/PageSearchLibrary.vue
index 4930d2b9..e6543bed 100644
--- a/web-src/src/pages/PageSearchLibrary.vue
+++ b/web-src/src/pages/PageSearchLibrary.vue
@@ -7,7 +7,6 @@
             <div class="field">
               <div class="control has-icons-left">
                 <input
-                  ref="search_field"
                   v-model="searchStore.query"
                   class="input is-rounded"
                   type="text"
@@ -163,23 +162,18 @@ export default {
       })
     },
     search(event) {
-      if (event) {
-        this.types = SEARCH_TYPES
-        this.limit = PAGE_SIZE
+      if (this.searchStore.query) {
+        if (event) {
+          this.types = SEARCH_TYPES
+          this.limit = PAGE_SIZE
+        }
+        this.searchStore.query = this.searchStore.query.trim()
+        this.reset()
+        this.types.forEach((type) => {
+          this.searchItems(type)
+        })
+        this.searchStore.add(this.searchStore.query)
       }
-      this.searchStore.query = this.searchStore.query.trim()
-      if (
-        !this.searchStore.query ||
-        !this.searchStore.query.replace(/^query:/u, '')
-      ) {
-        this.$refs.search_field.focus()
-        return
-      }
-      this.reset()
-      this.types.forEach((type) => {
-        this.searchItems(type)
-      })
-      this.searchStore.add(this.searchStore.query)
     },
     searchItems(type) {
       const music = type !== 'audiobook' && type !== 'podcast'
diff --git a/web-src/src/pages/PageSearchSpotify.vue b/web-src/src/pages/PageSearchSpotify.vue
index bad964bf..b94b781a 100644
--- a/web-src/src/pages/PageSearchSpotify.vue
+++ b/web-src/src/pages/PageSearchSpotify.vue
@@ -7,7 +7,6 @@
             <div class="field">
               <div class="control has-icons-left">
                 <input
-                  ref="search_field"
                   v-model="searchStore.query"
                   class="input is-rounded"
                   type="text"
@@ -152,22 +151,20 @@ export default {
       })
     },
     search(event) {
-      if (event) {
-        this.types = SEARCH_TYPES
-        this.parameters.limit = PAGE_SIZE
-      }
-      this.searchStore.query = this.searchStore.query.trim()
-      if (!this.searchStore.query) {
-        this.$refs.search_field.focus()
-        return
-      }
-      this.reset()
-      this.searchItems().then((data) => {
-        this.types.forEach((type) => {
-          this.results.set(type, data[`${type}s`])
+      if (this.searchStore.query) {
+        if (event) {
+          this.types = SEARCH_TYPES
+          this.parameters.limit = PAGE_SIZE
+        }
+        this.searchStore.query = this.searchStore.query.trim()
+        this.reset()
+        this.searchItems().then((data) => {
+          this.types.forEach((type) => {
+            this.results.set(type, data[`${type}s`])
+          })
         })
-      })
-      this.searchStore.add(this.searchStore.query)
+        this.searchStore.add(this.searchStore.query)
+      }
     },
     searchItems() {
       return webapi.spotify().then(({ data }) => {