diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index eeb1a930..8b729f24 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -109,6 +109,8 @@ export default class CodeEditor extends React.Component {
       scrollPastEnd: this.props.scrollPastEnd,
       inputStyle: 'textarea',
       dragDrop: false,
+      foldGutter: true,
+      gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter'],
       autoCloseBrackets: true,
       extraKeys: {
         Tab: function (cm) {
diff --git a/browser/main/global.styl b/browser/main/global.styl
index 1b40587c..613c7611 100644
--- a/browser/main/global.styl
+++ b/browser/main/global.styl
@@ -108,6 +108,21 @@ body[data-theme="dark"]
   background #B1D7FE
 ::selection
   background #B1D7FE
+.CodeMirror-foldmarker
+  font-family: arial
+
+.CodeMirror-foldgutter
+  width: .7em
+
+.CodeMirror-foldgutter-open,
+.CodeMirror-foldgutter-folded
+  cursor: pointer
+
+.CodeMirror-foldgutter-open:after
+  content: "\25BE"
+
+.CodeMirror-foldgutter-folded:after
+  content: "\25B8"
 
 .sortableItemHelper
   z-index modalZIndex + 5
diff --git a/lib/main.html b/lib/main.html
index f6b8b21c..5e5d13c3 100644
--- a/lib/main.html
+++ b/lib/main.html
@@ -93,6 +93,11 @@
   <script src="../node_modules/codemirror/addon/scroll/scrollpastend.js"></script>
   <script src="../node_modules/codemirror/addon/search/matchesonscrollbar.js"></script>
   <script src="../node_modules/codemirror/addon/search/jump-to-line.js"></script>
+
+  <script src="../node_modules/codemirror/addon/fold/brace-fold.js"></script>
+  <script src="../node_modules/codemirror/addon/fold/foldgutter.js"></script>
+  <script src="../node_modules/codemirror/addon/fold/foldcode.js"></script>
+
   <script src="../node_modules/codemirror/addon/dialog/dialog.js"></script>
   <script src="../node_modules/codemirror/addon/display/rulers.js"></script>