diff --git a/devtools/client/shared/widgets/TableWidget.js b/devtools/client/shared/widgets/TableWidget.js
index 6b8faaed4e3a..2ef7c31aaa43 100644
--- a/devtools/client/shared/widgets/TableWidget.js
+++ b/devtools/client/shared/widgets/TableWidget.js
@@ -452,11 +452,11 @@ TableWidget.prototype = {
     if (this.filteredValue == value) {
       return;
     }
+    this.filteredValue = value;
     if (!value) {
       this.emit(EVENTS.TABLE_FILTERED, []);
       return;
     }
-    this.filteredValue = value;
     // Shouldn't be case-sensitive
     value = value.toLowerCase();
 
diff --git a/devtools/client/storage/storage.xul b/devtools/client/storage/storage.xul
index 953be31776b4..aec2058cb51a 100644
--- a/devtools/client/storage/storage.xul
+++ b/devtools/client/storage/storage.xul
@@ -30,6 +30,7 @@
         <textbox id="storage-searchbox"
                  class="devtools-searchinput"
                  type="search"
+                 timeout="200"
                  placeholder="&searchBox.placeholder;"/>
       </hbox>
       <vbox id="storage-table" class="theme-sidebar" flex="1"/>
diff --git a/devtools/client/storage/ui.js b/devtools/client/storage/ui.js
index cde63e671b98..17e4c8435bdb 100644
--- a/devtools/client/storage/ui.js
+++ b/devtools/client/storage/ui.js
@@ -81,7 +81,7 @@ var StorageUI = this.StorageUI = function StorageUI(front, target, panelWin) {
 
   this.searchBox = this._panelDoc.getElementById("storage-searchbox");
   this.filterItems = this.filterItems.bind(this);
-  this.searchBox.addEventListener("input", this.filterItems);
+  this.searchBox.addEventListener("command", this.filterItems);
 
   this.front.listStores().then(storageTypes => {
     this.populateStorageTree(storageTypes);