diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index 1714e281..80b56df9 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -57,6 +57,7 @@ export default class CodeEditor extends React.Component {
       keyMap: this.props.keyMap,
       inputStyle: 'textarea',
       dragDrop: false,
+      searchbox: true,
       extraKeys: {
         Tab: function (cm) {
           const cursor = cm.getCursor()
diff --git a/lib/main.html b/lib/main.html
index f98e15f7..4d34fee3 100644
--- a/lib/main.html
+++ b/lib/main.html
@@ -64,6 +64,9 @@
 
   <script src="../node_modules/codemirror/addon/edit/continuelist.js"></script>
 
+  <script src="../node_modules/cm-searchbox/lib/searchbox.js"></script>
+  <script src="../node_modules/codemirror/addon/search/searchcursor.js"></script>
+
   <script src="../node_modules/raphael/raphael.min.js"></script>
   <script src="../node_modules/flowchart.js/release/flowchart.min.js"></script>
   <script>
@@ -87,5 +90,10 @@
     scriptEl.setAttribute('src', scriptUrl)
     document.body.appendChild(scriptEl)
   </script>
+  <style>
+    .ace_search {
+      background-color: #d9d9d9;
+    }
+  </style>
 </body>
 </html>
diff --git a/package.json b/package.json
index 9fad7db8..e09d0317 100644
--- a/package.json
+++ b/package.json
@@ -51,6 +51,7 @@
     "@rokt33r/season": "^5.3.0",
     "aws-sdk": "^2.48.0",
     "aws-sdk-mobile-analytics": "^0.9.2",
+    "cm-searchbox": "^1.0.8",
     "codemirror": "^5.19.0",
     "electron-config": "^0.2.1",
     "electron-gh-releases": "^2.0.2",
diff --git a/yarn.lock b/yarn.lock
index c7067c1b..bac0b6c8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1445,6 +1445,10 @@ clone@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
 
+cm-searchbox@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/cm-searchbox/-/cm-searchbox-1.0.8.tgz#76d6712b1f1b6c378a4d4eecaa9213ca60ce9999"
+
 co-with-promise@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co-with-promise/-/co-with-promise-4.6.0.tgz#413e7db6f5893a60b942cf492c4bec93db415ab7"