diff --git a/common/lib/xmodule/xmodule/js/src/html/edit.coffee b/common/lib/xmodule/xmodule/js/src/html/edit.coffee
index 64846d4bcb..1f86afa250 100644
--- a/common/lib/xmodule/xmodule/js/src/html/edit.coffee
+++ b/common/lib/xmodule/xmodule/js/src/html/edit.coffee
@@ -29,7 +29,7 @@ class @HTMLEditingDescriptor
       visual: false,
       plugins: "textcolor, link, image, codemirror",
       codemirror: {
-        path: "#{baseUrl}/js/vendor/CodeMirror"
+        path: "#{baseUrl}/js/vendor"
       },
       image_advtab: true,
       # We may want to add "styleselect" when we collect all styles used throughout the LMS
diff --git a/common/static/js/vendor/tiny_mce/plugins/codemirror/source.html b/common/static/js/vendor/tiny_mce/plugins/codemirror/source.html
index 41066f5f88..15de3748ab 100644
--- a/common/static/js/vendor/tiny_mce/plugins/codemirror/source.html
+++ b/common/static/js/vendor/tiny_mce/plugins/codemirror/source.html
@@ -46,20 +46,20 @@ function inArray(key, arr)
 		},
 		jsFiles: [// Default JS files
 // MODIFIED FOR EDX VENDOR FILE LOCATIONS.
-			'codemirror.js',
-//			'addon/edit/matchbrackets.js',
-			'xml.js',
-			'javascript.js',
-			'addons/css.js',
-			'addons/htmlmixed.js',
-			'addons/dialog/dialog.js',
-			'addons/searchcursor.js',
-			'addons/search.js'
-//			'addon/selection/active-line.js'
+            'codemirror-compressed.js',
+//			'addon/edit/matchbrackets.js', Chose not to enable
+//			'mode/xml/xml.js', In compressed
+//			'mode/javascript/javascript.js', In compressed
+//			'mode/css/css.js', In compressed
+//			'mode/htmlmixed/htmlmixed.js', In compressed
+			'CodeMirror/addons/dialog/dialog.js'
+//			'addon/search/searchcursor.js', In compressed
+//			'addon/search/search.js', In compressed
+//			'addon/selection/active-line.js' Chose not to enable
 		],
 		cssFiles: [
-			'codemirror.css',
-			'addons/dialog/dialog.css'
+			'CodeMirror/codemirror.css',
+			'CodeMirror/addons/dialog/dialog.css'
 		]
 	};