diff --git a/client/utils/codemirror-search.js b/client/utils/codemirror-search.js
index 9e5de16e7..3ed3116a6 100644
--- a/client/utils/codemirror-search.js
+++ b/client/utils/codemirror-search.js
@@ -515,6 +515,12 @@ function doSearch(cm, rev, persistent, immediate, ignoreQuery) {
       startSearch(cm, state, q);
       findNext(cm, rev);
     }
+    cm.on('change', function () {
+      var state = getSearchState(cm);
+      if (state.query) {
+        startSearch(cm, state, state.queryText);
+      }
+    });
   } else {
     dialog(cm, queryDialog, 'Search for:', q, function (query) {
       if (query && !state.query)