diff --git a/elements/noflo-context.html b/elements/noflo-context.html
index ff4ec25e5..f975a736d 100644
--- a/elements/noflo-context.html
+++ b/elements/noflo-context.html
@@ -165,9 +165,6 @@
         });
       },
       searchChanged: function () {
-        if (!this.search) {
-          return;
-        }
         if (this.search === 'graph settings') {
           this.showGraphInspector();
           return;
diff --git a/elements/noflo-search.html b/elements/noflo-search.html
index e453cf6ed..58c0a22b7 100644
--- a/elements/noflo-search.html
+++ b/elements/noflo-search.html
@@ -50,6 +50,7 @@
             this.resultsCard.parentNode.removeChild(this.resultsCard);
             this.resultsCard = null;
           }
+          this.fire('search', this.search);
           return;
         }
         while (this.results.length) {