diff --git a/client/utils/codemirror-search.js b/client/utils/codemirror-search.js
index 6e904656..9dbfd010 100644
--- a/client/utils/codemirror-search.js
+++ b/client/utils/codemirror-search.js
@@ -143,6 +143,7 @@ export default function(CodeMirror) {
       }
     } else {
       searchField.focus();
+      searchField.select();
     }
   }