diff --git a/ui/component/header/view.jsx b/ui/component/header/view.jsx
index bd35b553b..0943a7a62 100644
--- a/ui/component/header/view.jsx
+++ b/ui/component/header/view.jsx
@@ -100,23 +100,19 @@ const Header = (props: Props) => {
       clearEmailEntry();
       clearPasswordEntry();
 
-      if (isSignInPage && !emailToVerify) {
-        history.goBack();
-      }
-
-      if (isSignUpPage) {
-        history.goBack();
-      }
-
-      if (isPwdResetPage) {
-        history.goBack();
-      }
-
       if (syncError) {
         signOut();
       }
 
-      history.push('/');
+      if (isSignInPage && !emailToVerify) {
+        history.goBack();
+      } else if (isSignUpPage) {
+        history.goBack();
+      } else if (isPwdResetPage) {
+        history.goBack();
+      } else {
+        history.push('/');
+      }
     },
   };