diff --git a/common/lib/xmodule/xmodule/js/src/html/edit.coffee b/common/lib/xmodule/xmodule/js/src/html/edit.coffee
index b7699953e6..e678a9b2eb 100644
--- a/common/lib/xmodule/xmodule/js/src/html/edit.coffee
+++ b/common/lib/xmodule/xmodule/js/src/html/edit.coffee
@@ -2,6 +2,8 @@ class @HTMLEditingDescriptor
   constructor: (@element) ->
     @edit_box = CodeMirror.fromTextArea($(".edit-box", @element)[0], {
       mode: "text/html"
+      lineNumbers: true
+      lineWrapping: true
     })
 
   save: ->
diff --git a/common/lib/xmodule/xmodule/js/src/raw/edit/json.coffee b/common/lib/xmodule/xmodule/js/src/raw/edit/json.coffee
index b795970b73..7c3c09cefc 100644
--- a/common/lib/xmodule/xmodule/js/src/raw/edit/json.coffee
+++ b/common/lib/xmodule/xmodule/js/src/raw/edit/json.coffee
@@ -2,6 +2,8 @@ class @JSONEditingDescriptor extends XModule.Descriptor
   constructor: (@element) ->
     @edit_box = CodeMirror.fromTextArea($(".edit-box", @element)[0], {
       mode: { name: "javascript", json: true }
+      lineNumbers: true
+      lineWrapping: true
     })
 
   save: ->
diff --git a/common/lib/xmodule/xmodule/js/src/raw/edit/xml.coffee b/common/lib/xmodule/xmodule/js/src/raw/edit/xml.coffee
index 47c993e78d..68981e465b 100644
--- a/common/lib/xmodule/xmodule/js/src/raw/edit/xml.coffee
+++ b/common/lib/xmodule/xmodule/js/src/raw/edit/xml.coffee
@@ -2,6 +2,8 @@ class @XMLEditingDescriptor extends XModule.Descriptor
   constructor: (@element) ->
     @edit_box = CodeMirror.fromTextArea($(".edit-box", @element)[0], {
       mode: "xml"
+      lineNumbers: true
+      lineWrapping: true
     })
 
   save: ->