diff --git a/app/src/main/java/com/kamron/pogoiv/GoIVSettings.java b/app/src/main/java/com/kamron/pogoiv/GoIVSettings.java
index 85ee484af..9d730f403 100644
--- a/app/src/main/java/com/kamron/pogoiv/GoIVSettings.java
+++ b/app/src/main/java/com/kamron/pogoiv/GoIVSettings.java
@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.os.Build;
 
 public class GoIVSettings {
 
@@ -38,7 +39,12 @@ public boolean shouldShouldConfirmationDialogs() {
     }
 
     public boolean isManualScreenshotModeEnabled() {
-        return prefs.getBoolean(MANUAL_SCREENSHOT_MODE, false);
+        //XXX unify with code in SettingsActivity.java
+        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT_WATCH) {
+            return true;
+        } else {
+            return prefs.getBoolean(MANUAL_SCREENSHOT_MODE, false);
+        }
     }
 
     public boolean shouldDeleteScreenshots() {
diff --git a/app/src/main/java/com/kamron/pogoiv/SettingsActivity.java b/app/src/main/java/com/kamron/pogoiv/SettingsActivity.java
index a78f0502c..43f9772f3 100644
--- a/app/src/main/java/com/kamron/pogoiv/SettingsActivity.java
+++ b/app/src/main/java/com/kamron/pogoiv/SettingsActivity.java
@@ -85,7 +85,7 @@ public boolean onPreferenceClick(Preference preference) {
                 preferenceScreen.removePreference(checkForUpdatePreference);
             }
 
-            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT) {
+            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT_WATCH) {
                 SwitchPreference manualScreenshotModePreference = (SwitchPreference) getPreferenceManager().findPreference(GoIVSettings.MANUAL_SCREENSHOT_MODE);
                 manualScreenshotModePreference.setDefaultValue(true);
                 manualScreenshotModePreference.setChecked(true);