diff --git a/frontend/src/component/album/toolbar.vue b/frontend/src/component/album/toolbar.vue
index 3400239c4..2ea4e0c9f 100644
--- a/frontend/src/component/album/toolbar.vue
+++ b/frontend/src/component/album/toolbar.vue
@@ -1,7 +1,7 @@
 <template>
   <v-form ref="form" lazy-validation
           dense autocomplete="off" class="p-photo-toolbar p-album-toolbar" accept-charset="UTF-8"
-          @submit.prevent="filterChange">
+          @submit.prevent="updateQuery">
     <v-toolbar flat :dense="$vuetify.breakpoint.smAndDown" class="page-toolbar" color="secondary">
       <v-toolbar-title :title="album.Title">
         {{ album.Title }}
@@ -150,7 +150,7 @@ export default {
       }
     },
     dropdownChange() {
-      this.filterChange();
+      this.updateQuery();
 
       if (window.innerWidth < 600) {
         this.searchExpanded = false;
@@ -163,10 +163,9 @@ export default {
     },
     setView(name) {
       this.settings.view = name;
-      this.filterChange();
+      this.updateQuery();
     },
-    clearQuery() {
-      this.filter.q = '';
+    updateQuery() {
       this.filterChange();
     },
     download() {
diff --git a/frontend/src/component/photo/toolbar.vue b/frontend/src/component/photo/toolbar.vue
index 2504af6c4..dc5db988d 100644
--- a/frontend/src/component/photo/toolbar.vue
+++ b/frontend/src/component/photo/toolbar.vue
@@ -13,8 +13,6 @@
                     prepend-inner-icon="search"
                     color="secondary-dark"
                     @input="onChangeQuery"
-                    @change="updateQuery"
-                    @blur="updateQuery"
                     @keyup.enter.native="updateQuery"
                     @click:clear="clearQuery"
       ></v-text-field>
@@ -231,7 +229,7 @@ export default {
       return this.all.years.concat(options.IndexedYears());
     },
     dropdownChange() {
-      this.filterChange();
+      this.updateQuery();
 
       if (window.innerWidth < 600) {
         this.searchExpanded = false;
@@ -239,7 +237,7 @@ export default {
     },
     setView(name) {
       this.settings.view = name;
-      this.filterChange();
+      this.updateQuery();
     },
     onChangeQuery(val) {
       this.q = String(val);
diff --git a/frontend/src/pages/albums.vue b/frontend/src/pages/albums.vue
index b46136cb4..da520bfa7 100644
--- a/frontend/src/pages/albums.vue
+++ b/frontend/src/pages/albums.vue
@@ -15,8 +15,6 @@
                       prepend-inner-icon="search"
                       color="secondary-dark"
                       @input="onChangeQuery"
-                      @change="updateQuery"
-                      @blur="updateQuery"
                       @keyup.enter.native="updateQuery"
                       @click:clear="clearQuery"
         ></v-text-field>
diff --git a/frontend/src/pages/labels.vue b/frontend/src/pages/labels.vue
index db1caca47..6b54b76c6 100644
--- a/frontend/src/pages/labels.vue
+++ b/frontend/src/pages/labels.vue
@@ -15,8 +15,6 @@
                       autocapitalize="none"
                       color="secondary-dark"
                       @input="onChangeQuery"
-                      @change="updateQuery"
-                      @blur="updateQuery"
                       @keyup.enter.native="updateQuery"
                       @click:clear="clearQuery"
         ></v-text-field>
diff --git a/frontend/src/pages/library/errors.vue b/frontend/src/pages/library/errors.vue
index 8dba5516e..9bddd0bbf 100644
--- a/frontend/src/pages/library/errors.vue
+++ b/frontend/src/pages/library/errors.vue
@@ -12,8 +12,6 @@
                     prepend-inner-icon="search"
                     color="secondary-dark"
                     @input="onChangeQuery"
-                    @change="updateQuery"
-                    @blur="updateQuery"
                     @keyup.enter.native="updateQuery"
                     @click:clear="clearQuery"
       ></v-text-field>
diff --git a/frontend/src/pages/people/subjects.vue b/frontend/src/pages/people/subjects.vue
index 42ca03635..d79febe9e 100644
--- a/frontend/src/pages/people/subjects.vue
+++ b/frontend/src/pages/people/subjects.vue
@@ -15,8 +15,6 @@
                       autocapitalize="none"
                       color="secondary-dark"
                       @input="onChangeQuery"
-                      @change="updateQuery"
-                      @blur="updateQuery"
                       @keyup.enter.native="updateQuery"
                       @click:clear="clearQuery"
         ></v-text-field>
diff --git a/frontend/src/pages/places.vue b/frontend/src/pages/places.vue
index 789a620cd..e74a18ebf 100644
--- a/frontend/src/pages/places.vue
+++ b/frontend/src/pages/places.vue
@@ -5,7 +5,7 @@
         <div class="maplibregl-ctrl maplibregl-ctrl-group">
           <v-text-field v-model.lazy.trim="filter.q"
                         solo hide-details clearable flat single-line validate-on-blur
-                        class="pa-0 ma-0 input-search"
+                        class="input-search pa-0 ma-0"
                         :label="$gettext('Search')"
                         prepend-inner-icon="search"
                         browser-autocomplete="off"
@@ -13,8 +13,6 @@
                         autocapitalize="none"
                         color="secondary-dark"
                         @click:clear="clearQuery"
-                        @blur="formChange"
-                        @change="formChange"
                         @keyup.enter.native="formChange"
           ></v-text-field>
         </div>