diff --git a/src/components/lists/views/List.vue b/src/components/lists/views/List.vue
index 5aab6678..4a49dcc7 100644
--- a/src/components/lists/views/List.vue
+++ b/src/components/lists/views/List.vue
@@ -19,8 +19,7 @@
 					<button
 							class="button noshadow is-primary"
 							@click="searchTasks"
-							:class="{'is-loading': taskCollectionService.loading}"
-							:disabled="searchTerm === ''">
+							:class="{'is-loading': taskCollectionService.loading}">
 						Search
 					</button>
 				</div>
diff --git a/src/components/tasks/helpers/taskList.js b/src/components/tasks/helpers/taskList.js
index 0c7833e9..de92b7db 100644
--- a/src/components/tasks/helpers/taskList.js
+++ b/src/components/tasks/helpers/taskList.js
@@ -112,9 +112,11 @@ export default {
 			})
 		},
 		searchTasks() {
-			if (this.searchTerm === '') {
+			// Only search if the search term changed
+			if (this.$route.query === this.searchTerm) {
 				return
 			}
+
 			this.$router.push({
 				name: 'list.list',
 				query: {search: this.searchTerm}