diff --git a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Activity.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Activity.java
index 176c3fc3..957c8bc4 100644
--- a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Activity.java
+++ b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Activity.java
@@ -119,6 +119,8 @@ public class Apple2Activity extends Activity {
             setContentView(new View(this));
         }
 
+        Apple2Preferences.LANDSCAPE_MODE.load(this);
+
         Apple2CrashHandler.getInstance().initializeAndSetCustomExceptionHandler(this);
         if (sNativeBarfed) {
             Log.e(TAG, "NATIVE BARFED...", sNativeBarfedThrowable);
@@ -265,6 +267,7 @@ public class Apple2Activity extends Activity {
         // Dismiss these popups to avoid android.view.WindowLeaked issues
         synchronized (this) {
             dismissAllMenus();
+            dismissAllMenus(); // 2nd time should full exit calibration mode (if present)
             nativeEmulationPause();
         }
 
diff --git a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2VideoSettingsMenu.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2VideoSettingsMenu.java
index 0eb65ba5..f6a70c71 100644
--- a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2VideoSettingsMenu.java
+++ b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2VideoSettingsMenu.java
@@ -48,6 +48,11 @@ public class Apple2VideoSettingsMenu extends Apple2AbstractMenu {
         if (position < 0 || position >= SETTINGS.size) {
             throw new ArrayIndexOutOfBoundsException();
         }
+        if (position == SETTINGS.PORTRAIT_CALIBRATE.ordinal()) {
+            if (Apple2Preferences.LANDSCAPE_MODE.booleanValue(mActivity)) {
+                return false;
+            }
+        }
         return true;
     }