diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/GameActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/GameActivity.java
index 03f86ab..854ebe7 100644
--- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/GameActivity.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/GameActivity.java
@@ -115,7 +115,7 @@ public class GameActivity extends BaseActivity implements NavigationView.OnNavig
     protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
 
-        if(gameSolved) {
+        if(gameSolved || !startGame) {
             gameController.pauseTimer();
         } else {
             // start the game
@@ -412,7 +412,7 @@ public class GameActivity extends BaseActivity implements NavigationView.OnNavig
 
         gameController.initTimer();
 
-        if(!gameSolved) {
+        if(!gameSolved && startGame) {
             mHandler.postDelayed(new Runnable() {
                 @Override
                 public void run() {