diff --git a/edit.html b/edit.html
index efe3d6a2..e02a6b4f 100644
--- a/edit.html
+++ b/edit.html
@@ -26,6 +26,8 @@
     <link  href="vendor/codemirror/addon/dialog/dialog.css" rel="stylesheet">
     <script src="vendor/codemirror/addon/dialog/dialog.js"></script>
 
+    <script src="vendor/codemirror/addon/edit/closebrackets.js"></script>
+
     <link  href="vendor/codemirror/addon/search/matchesonscrollbar.css" rel="stylesheet">
     <script src="vendor/codemirror/addon/search/matchesonscrollbar.js"></script>
     <script src="vendor/codemirror/addon/scroll/annotatescrollbar.js"></script>
diff --git a/edit/codemirror-default.js b/edit/codemirror-default.js
index e92be6e4..4bf9498e 100644
--- a/edit/codemirror-default.js
+++ b/edit/codemirror-default.js
@@ -9,6 +9,7 @@
   }
 
   const defaults = {
+    autoCloseBrackets: prefs.get('editor.autoCloseBrackets'),
     extraKeys: Object.assign(CodeMirror.defaults.extraKeys || {}, {
       // independent of current keyMap
       'Alt-Enter': 'toggleStyle',
diff --git a/edit/codemirror-factory.js b/edit/codemirror-factory.js
index cb5e4586..d2b201b3 100644
--- a/edit/codemirror-factory.js
+++ b/edit/codemirror-factory.js
@@ -58,11 +58,6 @@ const cmFactory = (() => {
     if (option === 'colorpicker') {
       return;
     }
-    // FIXME: is this an overhead?
-    if (option === 'autoCloseBrackets' && value) {
-      return loadScript('/vendor/codemirror/addon/edit/closebrackets.js')
-        .then(() => setOption(option, value));
-    }
     if (option === 'theme') {
       const themeLink = $('#cm-theme');
       // use non-localized 'default' internally