diff --git a/app/assets/javascripts/app/frontend/controllers/editor.js b/app/assets/javascripts/app/frontend/controllers/editor.js
index c723f44e5..370b00f2f 100644
--- a/app/assets/javascripts/app/frontend/controllers/editor.js
+++ b/app/assets/javascripts/app/frontend/controllers/editor.js
@@ -16,6 +16,15 @@ angular.module('app.frontend')
       link:function(scope, elem, attrs, ctrl) {
 
         var handler = function(event) {
+	  // Handle Tab Key
+	  if (event.which == 9) {
+	      event.preventDefault();
+	      var start = event.target.selectionStart;
+	      var end = event.target.selectionEnd;
+	      var spaces = "    ";
+	      event.target.value = event.target.value.substring(0, start) 
+                  + spaces + event.target.value.substring(end);
+	  }
           if (event.ctrlKey || event.metaKey) {
               switch (String.fromCharCode(event.which).toLowerCase()) {
               case 's':