diff --git a/squarenotsquare/src/redux/actions/UserActions.js b/squarenotsquare/src/redux/actions/UserActions.js
index 6729c11..9675097 100644
--- a/squarenotsquare/src/redux/actions/UserActions.js
+++ b/squarenotsquare/src/redux/actions/UserActions.js
@@ -14,7 +14,7 @@ export function squareStartPressed(mode, username) {
         type: SQUARE_START,
         user: userState
       });
-    } else if (mode === 'addition') {
+    } else {
       squareNav('AdditionGame');
       dispatch({
         type: ADDITION_START,
@@ -26,7 +26,7 @@ export function squareStartPressed(mode, username) {
 
 export function squareFinished(answers, finalTime) {
   return (dispatch, getState) => {
-    setTimeout(() => squareNav('Score'), 3000);
+    squareNav('Score');
     const userState = getState().user;
     let newUser = {...userState};
     newUser.lastGameTime = finalTime;
@@ -43,7 +43,7 @@ export function squareFinished(answers, finalTime) {
 
 export function addFinished(answers, finalTime) {
   return (dispatch, getState) => {
-    setTimeout(() => squareNav('Score'), 3000);
+    squareNav('Score');
     const userState = getState().user;
     let newUser = {...userState};
     newUser.lastGameTime = finalTime;
diff --git a/squarenotsquare/src/screens/AdditionGame.js b/squarenotsquare/src/screens/AdditionGame.js
index 3750184..0482952 100644
--- a/squarenotsquare/src/screens/AdditionGame.js
+++ b/squarenotsquare/src/screens/AdditionGame.js
@@ -108,7 +108,7 @@ function AdditionGame(props){
     setHeaderColor(styles.darkGreen);
     setHeaderText(finalTime + ' s');
     setTimerState(4);
-    dispatch(addFinished(answers.current, finalTime));
+    setTimeout(() => dispatch(addFinished(answers.current, finalTime)),3000);
   }
 
   function generateLine(left, right, pairIndex) {
diff --git a/squarenotsquare/src/screens/Game.js b/squarenotsquare/src/screens/Game.js
index 6632002..b15d9dc 100644
--- a/squarenotsquare/src/screens/Game.js
+++ b/squarenotsquare/src/screens/Game.js
@@ -103,7 +103,7 @@ function Game(props){
     setHeaderColor(styles.darkGreen);
     setHeaderText(finalTime + ' s');
     setTimerState(4);
-    dispatch(squareFinished(answers.current, finalTime));
+    setTimeout(() => dispatch(squareFinished(answers.current, finalTime)),3000);
   }
 
   function generateSquare(pairIndex){