diff --git a/docs/updates/README.md b/docs/updates/README.md
index 2ef243a0f6..63b838fd92 100644
--- a/docs/updates/README.md
+++ b/docs/updates/README.md
@@ -114,6 +114,7 @@ This was a really great week for QA improvements as the debugger is getting more
 [@asolove]:http://github.com/asolove
 [@ryanjduffy]:http://github.com/ryanjduffy
 [@diessica]:http://github.com/diessica
+[@codehag]:http://github.com/codehag
 [@andreicristianpetcu]:http://github.com/andreicristianpetcu
 [@Andarist]:http://github.com/Andarist
 [pr-6]:https://github.com/devtools-html/debugger.html/pull/2784
diff --git a/src/components/Editor/SearchBar.js b/src/components/Editor/SearchBar.js
index ebbce9a40c..f544ab65d3 100644
--- a/src/components/Editor/SearchBar.js
+++ b/src/components/Editor/SearchBar.js
@@ -255,9 +255,10 @@ class SearchBar extends Component {
   }
 
   closeSearch(e: SyntheticEvent) {
-    const { editor } = this.props;
+    const { editor, setFileSearchQuery } = this.props;
 
     if (this.props.searchOn && editor) {
+      setFileSearchQuery("");
       this.clearSearch();
       this.props.toggleFileSearch(false);
       this.props.toggleSymbolSearch(false);