diff --git a/app/assets/javascripts/app/frontend/controllers/editor.js b/app/assets/javascripts/app/frontend/controllers/editor.js
index 6c506be8d..a7686d0d2 100644
--- a/app/assets/javascripts/app/frontend/controllers/editor.js
+++ b/app/assets/javascripts/app/frontend/controllers/editor.js
@@ -19,9 +19,11 @@ angular.module('app.frontend')
         /**
          * Insert 4 spaces when a tab key is pressed,
          * only used when inside of the text editor.
+	 * If the shift key is pressed first, this event is
+	 * not fired. 
          */
         var handleTab = function (event) {
-          if (event.which == 9) {
+	  if (!event.shiftKey && event.which == 9) {
             event.preventDefault();
             var start = this.selectionStart;
             var end = this.selectionEnd;