diff --git a/app/controllers/application.js b/app/controllers/application.js
index 20cb675da58..e8c9e107abf 100644
--- a/app/controllers/application.js
+++ b/app/controllers/application.js
@@ -21,11 +21,7 @@ export default Controller.extend(EKMixin, {
     }),
 
     actions: {
-        search(q) {
-            if (q !== undefined) {
-                this.set('searchQuery', q);
-            }
-
+        search() {
             this.transitionToRoute('search', {
                 queryParams: {
                     q: this.get('searchQuery'),
diff --git a/app/controllers/search.js b/app/controllers/search.js
index 5bb63fc074c..76cab7279d1 100644
--- a/app/controllers/search.js
+++ b/app/controllers/search.js
@@ -3,12 +3,10 @@ import { computed } from '@ember/object';
 import { alias, bool, readOnly } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
 
-import { task, timeout } from 'ember-concurrency';
+import { task } from 'ember-concurrency';
 
 import PaginationMixin from '../mixins/pagination';
 
-const DEBOUNCE_MS = 250;
-
 export default Controller.extend(PaginationMixin, {
     search: service(),
     queryParams: ['q', 'page', 'per_page', 'sort'],
@@ -42,13 +40,10 @@ export default Controller.extend(PaginationMixin, {
     hasItems: bool('totalItems'),
 
     dataTask: task(function* (params) {
-        // debounce the search query
-        yield timeout(DEBOUNCE_MS);
-
         if (params.q !== null) {
             params.q = params.q.trim();
         }
 
         return yield this.store.query('crate', params);
-    }).restartable(),
+    }).drop(),
 });
diff --git a/app/templates/application.hbs b/app/templates/application.hbs
index 8384ace3b41..8e60329cfdc 100644
--- a/app/templates/application.hbs
+++ b/app/templates/application.hbs
@@ -21,7 +21,7 @@
         <input type="text" class="search" name="q" id="cargo-desktop-search"
                 placeholder="Click or press 'S' to search..."
                 value={{searchQuery}}
-                oninput={{action "search" value="target.value"}}
+                oninput={{action (mut searchQuery) value="target.value"}}
                 autofocus="autofocus"
                 tabindex="1"
                 required
@@ -106,7 +106,7 @@
     <input type="text" class="search" name="q"
             placeholder="Search"
             value={{searchQuery}}
-            oninput={{action "search" value="target.value"}}
+            oninput={{action (mut searchQuery) value="target.value"}}
             autocorrect="off"
             tabindex="1"
             required>