diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index bb430c31a..c96740755 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -10,6 +10,9 @@
  - fixed: URLs that shouldn't happen  (#10353)
  - Added more information output to EMS record importer.
  - Fixed a search results display error with synopsis.
+ - Fixed a load problem with Code Editor by making user toggle it on. This is
+   better than normal anyway since many users appear not to want to use the
+   editor in most cases.
  - fixed: i18n typo in Survey exit URL hover help.
  - fixed: Survey jump target and jump expression precedence order across Section, Question, Answer.
  - rfre #9998: Mark inbox messages read/unread
diff --git a/lib/WebGUI/Form/Codearea.pm b/lib/WebGUI/Form/Codearea.pm
index 653dd0bd0..24d329393 100644
--- a/lib/WebGUI/Form/Codearea.pm
+++ b/lib/WebGUI/Form/Codearea.pm
@@ -158,6 +158,7 @@ sub toHtml {
                 syntax          : "$syntax",
                 start_highlight : true,
                 show_line_colors: true,
+                display         : "later",
                 toolbar         : "search, go_to_line, |, undo, redo, |, syntax_selection, highlight, reset_highlight, |, help"
             });
         </script>