diff --git a/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.8.js b/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.9.js
similarity index 96%
rename from public/js/lib/coursewares/coursewaresHCJQFramework_0.1.8.js
rename to public/js/lib/coursewares/coursewaresHCJQFramework_0.1.9.js
index 9a7531aef2..fdb9c84ed8 100644
--- a/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.8.js
+++ b/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.9.js
@@ -16,6 +16,14 @@ var editor = CodeMirror.fromTextArea(document.getElementById("codeEditor"), {
   onKeyEvent: doLinting
 });
 
+var defaultKeymap = {
+  'Cmd-E': 'emmet.expand_abbreviation',
+  'Tab': 'emmet.expand_abbreviation_with_tab',
+  'Enter': 'emmet.insert_formatted_line_break_only'
+};
+
+emmetCodeMirror(editor, defaultKeymap);
+
 
 // Hijack tab key to insert two spaces instead
 editor.setOption("extraKeys", {
diff --git a/views/coursewares/showHTML.jade b/views/coursewares/showHTML.jade
index c363fa921c..a3cf951946 100644
--- a/views/coursewares/showHTML.jade
+++ b/views/coursewares/showHTML.jade
@@ -18,6 +18,7 @@ block content
     script(src='/js/lib/codemirror/mode/xml/xml.js')
     script(src='/js/lib/codemirror/mode/css/css.js')
     script(src='/js/lib/codemirror/mode/htmlmixed/htmlmixed.js')
+    script(src='/js/lib/codemirror/addon/emmet/emmet.js')
     .row.courseware-height
         .vertical-scroll
             .col-xs-12.col-sm-12.col-md-3.col-lg-3
@@ -94,4 +95,4 @@ block content
                                 span.completion-icon.ion-checkmark-circled.text-primary
                             a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress
     include ../partials/challenge-modals
-    script(src="/js/lib/coursewares/coursewaresHCJQFramework_0.1.8.js")
+    script(src="/js/lib/coursewares/coursewaresHCJQFramework_0.1.9.js")