diff --git a/public/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js b/public/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js
index 236c80b05a..7f3cad5eb8 100644
--- a/public/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js
+++ b/public/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js
@@ -22,8 +22,12 @@ var editor = myCodeMirror;
 // Hijack tab key to insert two spaces instead
 editor.setOption("extraKeys", {
     Tab: function(cm) {
-        var spaces = Array(cm.getOption("indentUnit") + 1).join(" ");
-        cm.replaceSelection(spaces);
+        if (cm.somethingSelected()){
+		    cm.indentSelection("add");
+	    } else {
+        	var spaces = Array(cm.getOption("indentUnit") + 1).join(" ");
+		    cm.replaceSelection(spaces);
+	    }
     },
     "Ctrl-Enter": function() {
         return false;