diff --git a/app/assets/javascripts/app/frontend/controllers/editor.js b/app/assets/javascripts/app/frontend/controllers/editor.js
index 6266db8a7..6c506be8d 100644
--- a/app/assets/javascripts/app/frontend/controllers/editor.js
+++ b/app/assets/javascripts/app/frontend/controllers/editor.js
@@ -23,11 +23,17 @@ angular.module('app.frontend')
         var handleTab = function (event) {
           if (event.which == 9) {
             event.preventDefault();
-            var start = event.target.selectionStart;
-            var end = event.target.selectionEnd;
+            var start = this.selectionStart;
+            var end = this.selectionEnd;
             var spaces = "    ";
-            event.target.value = event.target.value.substring(0, start)
-              + spaces + event.target.value.substring(end);
+
+	    // Insert 4 spaces
+            this.value = this.value.substring(0, start)
+              + spaces + this.value.substring(end);
+
+	    // Place cursor 4 spaces away from where
+	    // the tab key was pressed
+	    this.selectionStart = this.selectionEnd = start + 4;
           }
         }