diff --git a/IPython/html/static/edit/js/editor.js b/IPython/html/static/edit/js/editor.js
index 6895254..4a0a453 100644
--- a/IPython/html/static/edit/js/editor.js
+++ b/IPython/html/static/edit/js/editor.js
@@ -116,8 +116,11 @@ function($,
             if (!options.hasOwnProperty(opt)) {
                 continue;
             }
-            console.log(opt, options[opt]);
-            this.codemirror.setOption(opt, options[opt]);
+            var value = options[opt];
+            if (value === null) {
+                value = CodeMirror.defaults[opt];
+            }
+            this.codemirror.setOption(opt, value);
         }
     };