diff --git a/public/js/lib/bonfire/bonfireFramework_v0.1.2.js b/public/js/lib/bonfire/bonfireFramework_v0.1.2.js
index 4b2edebb0e..a4ae597c07 100644
--- a/public/js/lib/bonfire/bonfireFramework_v0.1.2.js
+++ b/public/js/lib/bonfire/bonfireFramework_v0.1.2.js
@@ -18,8 +18,20 @@ editor.setSize("100%", "auto");
 // Hijack tab key to enter two spaces intead
 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);
+        }
+    },
+    "Shift-Tab": function(cm) {
+        if (cm.somethingSelected()){
+            cm.indentSelection("subtract");
+        } else {
+            var spaces = Array(cm.getOption("indentUnit") + 1).join(" ");
+            cm.replaceSelection(spaces);
+        }
     },
     "Ctrl-Enter": function() {
         bonfireExecute();
diff --git a/public/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js b/public/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js
index 236c80b05a..d7928afc20 100644
--- a/public/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js
+++ b/public/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js
@@ -22,10 +22,23 @@ 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);
+        }
+    },
+    "Shift-Tab": function(cm) {
+        if (cm.somethingSelected()){
+            cm.indentSelection("subtract");
+        } else {
+            var spaces = Array(cm.getOption("indentUnit") + 1).join(" ");
+            cm.replaceSelection(spaces);
+        }
     },
     "Ctrl-Enter": function() {
+        bonfireExecute();
         return false;
     }
 });
diff --git a/public/js/lib/coursewares/coursewaresJSFramework.js b/public/js/lib/coursewares/coursewaresJSFramework.js
index 60af334324..ee89e7eaf4 100644
--- a/public/js/lib/coursewares/coursewaresJSFramework.js
+++ b/public/js/lib/coursewares/coursewaresJSFramework.js
@@ -18,8 +18,20 @@ editor.setSize("100%", "auto");
 // Hijack tab key to enter two spaces intead
 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);
+        }
+    },
+    "Shift-Tab": function(cm) {
+        if (cm.somethingSelected()){
+            cm.indentSelection("subtract");
+        } else {
+            var spaces = Array(cm.getOption("indentUnit") + 1).join(" ");
+            cm.replaceSelection(spaces);
+        }
     },
     "Ctrl-Enter": function() {
         bonfireExecute();