diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index 28fc9b1f..5d799935 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -63,6 +63,7 @@ export default class CodeEditor extends React.Component {
       scrollPastEnd: this.props.scrollPastEnd,
       inputStyle: 'textarea',
       dragDrop: false,
+      autoCloseBrackets: true,
       extraKeys: {
         Tab: function (cm) {
           const cursor = cm.getCursor()
diff --git a/lib/finder.html b/lib/finder.html
index c6ad502e..b57e3047 100644
--- a/lib/finder.html
+++ b/lib/finder.html
@@ -35,6 +35,7 @@
   <script src="../node_modules/codemirror/keymap/vim.js"></script>
   <script src="../node_modules/codemirror/keymap/emacs.js"></script>
   <script src="../node_modules/codemirror/addon/runmode/runmode.js"></script>
+  <script src="../node_modules/codemirror/addon/edit/closebrackets.js"></script>
 
   <script src="../node_modules/raphael/raphael.min.js"></script>
   <script src="../node_modules/flowchart.js/release/flowchart.min.js"></script>
diff --git a/lib/main.html b/lib/main.html
index d7936628..11c1c62e 100644
--- a/lib/main.html
+++ b/lib/main.html
@@ -80,6 +80,8 @@
 
   <script src="../node_modules/codemirror/addon/edit/continuelist.js"></script>
 
+  <script src="../node_modules/codemirror/addon/edit/closebrackets.js"></script>
+
   <script src="../node_modules/codemirror/addon/search/search.js"></script>
   <script src="../node_modules/codemirror/addon/search/searchcursor.js"></script>
   <script src="../node_modules/codemirror/addon/scroll/annotatescrollbar.js"></script>