diff --git a/client/modules/IDE/components/Editor.js b/client/modules/IDE/components/Editor.js
index 8b2bd924..400aa3f3 100644
--- a/client/modules/IDE/components/Editor.js
+++ b/client/modules/IDE/components/Editor.js
@@ -1,6 +1,7 @@
 import React, { PropTypes } from 'react';
 import EditorAccessibility from '../components/EditorAccessibility';
 import CodeMirror from 'codemirror';
+import beautify from 'js-beautify';
 import 'codemirror/mode/javascript/javascript';
 import 'codemirror/mode/css/css';
 import 'codemirror/mode/htmlmixed/htmlmixed';
@@ -65,6 +66,14 @@ class Editor extends React.Component {
     this._cm.getWrapperElement().style['font-size'] = `${this.props.fontSize}px`;
     this._cm.setOption('indentWithTabs', this.props.isTabIndent);
     this._cm.setOption('tabSize', this.props.indentationAmount);
+
+    this._cm.on('keydown', (_cm, e) => {
+      if (e.key === 'Tab' && e.shiftKey) {
+        _cm.doc.setValue(beautify(_cm.doc.getValue(),
+          { indent_size: this.props.indentationAmount,
+            indent_with_tabs: this.props.isTabIndent }));
+      }
+    });
   }
 
   componentDidUpdate(prevProps) {
@@ -100,7 +109,10 @@ class Editor extends React.Component {
 
   render() {
     return (
-      <section title="code editor" role="main">
+      <section
+        title="code editor"
+        role="main"
+      >
         <div ref="container" className="editor-holder" tabIndex="0">
         </div>
         <EditorAccessibility
diff --git a/package.json b/package.json
index 55f1f32a..56e95a68 100644
--- a/package.json
+++ b/package.json
@@ -79,6 +79,7 @@
     "file-saver": "^1.3.2",
     "file-type": "^3.8.0",
     "htmlhint": "^0.9.13",
+    "js-beautify": "^1.6.4",
     "jshint": "^2.9.2",
     "jszip": "^3.0.0",
     "jszip-utils": "0.0.2",