diff --git a/client/modules/IDE/components/Editor.js b/client/modules/IDE/components/Editor.js
index d6ef5ba2..5375ff04 100644
--- a/client/modules/IDE/components/Editor.js
+++ b/client/modules/IDE/components/Editor.js
@@ -18,7 +18,7 @@ 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('indentUnit', this.props.indentationAmount);
+    this._cm.setOption('tabSize', this.props.indentationAmount);
   }
 
   componentDidUpdate(prevProps) {
diff --git a/client/modules/IDE/reducers/preferences.js b/client/modules/IDE/reducers/preferences.js
index 0fb4c13b..0f7b084c 100644
--- a/client/modules/IDE/reducers/preferences.js
+++ b/client/modules/IDE/reducers/preferences.js
@@ -3,7 +3,7 @@ import * as ActionTypes from '../../../constants';
 const initialState = {
   isVisible: false,
   fontSize: 18,
-  indentationAmount: 4,
+  indentationAmount: 2,
   isTabIndent: true
 };