diff --git a/app/src/main/java/org/secuso/privacyfriendlyminesweeper/activities/PlayActivity.java b/app/src/main/java/org/secuso/privacyfriendlyminesweeper/activities/PlayActivity.java
index b737389..5e7a326 100644
--- a/app/src/main/java/org/secuso/privacyfriendlyminesweeper/activities/PlayActivity.java
+++ b/app/src/main/java/org/secuso/privacyfriendlyminesweeper/activities/PlayActivity.java
@@ -219,6 +219,12 @@ else if((numberOfColumns == 12) && (numberOfRows == 19) && (numberOfBombs == 46)
             }
         }
 
+        if (param == null && !savecheck && landscape) {
+            int save = numberOfColumns;
+            numberOfColumns = numberOfRows;
+            numberOfRows = save;
+        }
+
         //Creating the right sized the PlayingField
         numberOfCells = numberOfRows * numberOfColumns;
         data = new int[numberOfRows][numberOfColumns];
@@ -249,11 +255,6 @@ else if((numberOfColumns == 12) && (numberOfRows == 19) && (numberOfBombs == 46)
                 savecheck = true;
                 savedinstancestate = true;
             }
-            if (numberOfRows < numberOfColumns) {
-                int save = numberOfColumns;
-                numberOfColumns = numberOfRows;
-                numberOfRows = save;
-            }
         }
 
         //parce the Content and Status String if this is loading a saved game