diff --git a/src/components/paint-editor/paint-editor.jsx b/src/components/paint-editor/paint-editor.jsx
index 37d45c70..11e089b7 100644
--- a/src/components/paint-editor/paint-editor.jsx
+++ b/src/components/paint-editor/paint-editor.jsx
@@ -186,6 +186,12 @@ class PaintEditorComponent extends React.Component {
                     {/* Modes */}
                     {this.state.canvas ? (
                         <div className={styles.modeSelector}>
+                            <SelectMode
+                                onUpdateSvg={this.props.onUpdateSvg}
+                            />
+                            <ReshapeMode
+                                onUpdateSvg={this.props.onUpdateSvg}
+                            />
                             <BrushMode
                                 canvas={this.state.canvas}
                                 onUpdateSvg={this.props.onUpdateSvg}
@@ -198,16 +204,11 @@ class PaintEditorComponent extends React.Component {
                                 canvas={this.state.canvas}
                                 onUpdateSvg={this.props.onUpdateSvg}
                             />
+                            {/* Text mode will go here */}
                             <LineMode
                                 canvas={this.state.canvas}
                                 onUpdateSvg={this.props.onUpdateSvg}
                             />
-                            <SelectMode
-                                onUpdateSvg={this.props.onUpdateSvg}
-                            />
-                            <ReshapeMode
-                                onUpdateSvg={this.props.onUpdateSvg}
-                            />
                             <OvalMode
                                 onUpdateSvg={this.props.onUpdateSvg}
                             />
diff --git a/src/reducers/modes.js b/src/reducers/modes.js
index 00f12c50..831ed7df 100644
--- a/src/reducers/modes.js
+++ b/src/reducers/modes.js
@@ -2,7 +2,7 @@ import Modes from '../modes/modes';
 import log from '../log/log';
 
 const CHANGE_MODE = 'scratch-paint/modes/CHANGE_MODE';
-const initialState = Modes.BRUSH;
+const initialState = Modes.SELECT;
 
 const reducer = function (state, action) {
     if (typeof state === 'undefined') state = initialState;