diff --git a/editor-tool-highlighting/src/main/resources/SyntaxHighlighting/SyntaxHighlighting.xml b/editor-tool-highlighting/src/main/resources/SyntaxHighlighting/SyntaxHighlighting.xml
index 9302193..d71fbc1 100644
--- a/editor-tool-highlighting/src/main/resources/SyntaxHighlighting/SyntaxHighlighting.xml
+++ b/editor-tool-highlighting/src/main/resources/SyntaxHighlighting/SyntaxHighlighting.xml
@@ -32,7 +32,7 @@
   <customClass/>
   <contentAuthor>xwiki:XWiki.Admin</contentAuthor>
   <creationDate>1450093299000</creationDate>
-  <date>1450108239000</date>
+  <date>1450188859000</date>
   <contentUpdateDate>1450108212000</contentUpdateDate>
   <version>1.1</version>
   <title>SyntaxHighlighting</title>
@@ -119,7 +119,7 @@
     <className>XWiki.JavaScriptExtension</className>
     <guid>ae324f77-9a39-4a22-b789-fb02e302d54f</guid>
     <property>
-      <cache>long</cache>
+      <cache>default</cache>
     </property>
     <property>
       <code>#includeMacros('Macros')
@@ -127,7 +127,7 @@
 ## Only do work if the extension is enabled.
 #if ($configuration.getValue('enabled') == 1)
 
-define([], function () {
+define(['jquery'], function ($) {
   var codeMirrors = [];
 
   /* Initialize the CodeMirror library and then start registering the extra modules. */
@@ -172,12 +172,18 @@ define([], function () {
     //
     // Attach codeMirrors to all the elements matched with the propertyPattern.
     //
+    var codeMirrorState = window.localStorage['XWiki.extension.SyntaxHighlighting.disable'] || 0;
     var textareas = $$(propertyPattern);
     for (var i = 0; i&lt;textareas.length; ++i) {
       var textarea = textareas[i];
       // If the textarea is not visible, like the object editor's textareas are when they are not expanded, delay the initialization
       if (textarea.offsetWidth &gt; 0 || textarea.offsetHeight &gt; 0) {
-        initSingleCodeMirror(textarea, codeMirrorMode);
+        if(codeMirrorState === '1') {
+          displayEnableCheckbox(textarea, codeMirrorMode);
+        }
+        else {
+          initSingleCodeMirror(textarea, codeMirrorMode);
+        }
       } else {
         var objectDiv = textarea.up('.xobject');
         if (!objectDiv) {
@@ -197,6 +203,16 @@ define([], function () {
     }
   }
 
+  // Add a checkbox to enable CodeMirror for the user
+  var displayEnableCheckbox = function (textarea, codeMirrorMode) {
+    var openInstances = $('.enableCodeMirror').length;
+    $('&lt;div class="meta-versionSummary enableCodeMirror"&gt;&lt;input type="checkbox" class="SHcheckbox" id="enableCodeMirror'+openInstances+'"/&gt; &lt;label for="enableCodeMirror'+openInstances+'"&gt;Allow Syntax Highlighting&lt;/label&gt;&lt;/div&gt;').insertAfter(textarea).on('click',function() {
+      initSingleCodeMirror(textarea, codeMirrorMode);
+      $(this).remove();
+      window.localStorage['XWiki.extension.SyntaxHighlighting.disable'] = 0;
+    });
+  }
+
   var initSingleCodeMirror = function (textarea, codeMirrorMode) {
     // FIXME: Until a better way comes up, we`ll just reuse the xwiki 2.1 syntax mode for 2.0 as well.
     if (codeMirrorMode == 'xwiki/2.0') {
@@ -328,6 +344,16 @@ define([], function () {
 
       // console.log('CodeMirror instance initialized for mode: ' + codeMirrorMode);
 
+      // Add a checkbox to disable CodeMirror for the user
+      var openInstances = jQuery('.disableCodeMirror').length;
+      var codeMirrorDiv = jQuery(textarea).siblings('.CodeMirror');
+jQuery('&lt;div class="meta-versionSummary disableCodeMirror"&gt;&lt;input type="checkbox" checked="checked" class="SHcheckbox" id="disableCodeMirror'+openInstances+'"/&gt; &lt;label for="disableCodeMirror'+openInstances+'" &gt;Allow Syntax Highlighting&lt;/label&gt;&lt;/div&gt;').insertAfter(codeMirrorDiv).on('click',function() {
+        codeMirror.toTextArea();
+        displayEnableCheckbox(textarea, codeMirrorMode);
+        $(this).remove();
+        window.localStorage['XWiki.extension.SyntaxHighlighting.disable'] = 1;
+      });
+
       // Track this new instance by adding it to the list of instances.
       codeMirrors.push(codeMirror);
     }, function (err) {