1 files changed, 20 insertions, 1 deletions
diff --git a/mascara/src/app/first-time/create-password-screen.js b/mascara/src/app/first-time/create-password-screen.js
index 102d8a7c3..17b9174b8 100644
--- a/mascara/src/app/first-time/create-password-screen.js
+++ b/mascara/src/app/first-time/create-password-screen.js
@@ -11,6 +11,8 @@ class CreatePasswordScreen extends Component {
     isLoading: PropTypes.bool.isRequired,
     createAccount: PropTypes.func.isRequired,
     history: PropTypes.object.isRequired,
+    isInitialized: PropTypes.bool,
+    isUnlocked: PropTypes.bool,
   }
 
   state = {
@@ -18,6 +20,13 @@ class CreatePasswordScreen extends Component {
     confirmPassword: '',
   }
 
+  componentWillMount () {
+    const { isInitialized, isUnlocked, history } = this.props
+    if (isInitialized || isUnlocked) {
+      history.push(DEFAULT_ROUTE)
+    }
+  }
+
   isValid () {
     const { password, confirmPassword } = this.state
 
@@ -107,8 +116,18 @@ class CreatePasswordScreen extends Component {
   }
 }
 
+const mapStateToProps = state => {
+  const { metamask: { isInitialized, isUnlocked }, appState: { isLoading } } = state
+
+  return {
+    isLoading,
+    isInitialized,
+    isUnlocked,
+  }
+}
+
 export default connect(
-  ({ appState: { isLoading } }) => ({ isLoading }),
+  mapStateToProps,
   dispatch => ({
     createAccount: password => dispatch(createNewVaultAndKeychain(password)),
   })