diff --git a/app/src/main/java/net/sourceforge/opencamera/MainActivity.java b/app/src/main/java/net/sourceforge/opencamera/MainActivity.java
index 257b507e8dac4bc0974500f332a6dee5bd9ed3a3..d714615201c5d72fd835cf0a8b6b9d6ca1361075 100644
--- a/app/src/main/java/net/sourceforge/opencamera/MainActivity.java
+++ b/app/src/main/java/net/sourceforge/opencamera/MainActivity.java
@@ -664,7 +664,7 @@ public class MainActivity extends Activity {
      */
     public boolean isInFullScreenMode() {
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
-        String preview_size = sharedPreferences.getString(PreferenceKeys.PreviewSizePreferenceKey, "preference_preview_size_display");
+        String preview_size = sharedPreferences.getString(PreferenceKeys.PreviewSizePreferenceKey, "preference_preview_size_wysiwyg");
         return !(preview_size.equals("preference_preview_size_wysiwyg") || preview.isVideo());
     }
 
diff --git a/app/src/main/java/net/sourceforge/opencamera/MyApplicationInterface.java b/app/src/main/java/net/sourceforge/opencamera/MyApplicationInterface.java
index 3623718d81733ed616489f907aa1e9efe03dddfd..2726706faa1e5e618befa4e3c9c7bf57e2bee897 100644
--- a/app/src/main/java/net/sourceforge/opencamera/MyApplicationInterface.java
+++ b/app/src/main/java/net/sourceforge/opencamera/MyApplicationInterface.java
@@ -1029,7 +1029,7 @@ public class MyApplicationInterface extends BasicApplicationInterface {
 
     @Override
     public String getPreviewSizePref() {
-        return sharedPreferences.getString(PreferenceKeys.PreviewSizePreferenceKey, "preference_preview_size_display");
+        return sharedPreferences.getString(PreferenceKeys.PreviewSizePreferenceKey, "preference_preview_size_wysiwyg");
     }
 
     @Override
diff --git a/app/src/main/java/net/sourceforge/opencamera/preview/BasicApplicationInterface.java b/app/src/main/java/net/sourceforge/opencamera/preview/BasicApplicationInterface.java
index 9695e890855b82037fe5df6d9681b6e1a9a052a3..58395005f0ba191aca7fd2730ec57092dc69d885 100644
--- a/app/src/main/java/net/sourceforge/opencamera/preview/BasicApplicationInterface.java
+++ b/app/src/main/java/net/sourceforge/opencamera/preview/BasicApplicationInterface.java
@@ -185,7 +185,7 @@ public abstract class BasicApplicationInterface implements ApplicationInterface
 
     @Override
     public String getPreviewSizePref() {
-        return "preference_preview_size_display";
+        return "preference_preview_size_wysiwyg";
     }
 
     @Override
diff --git a/app/src/main/java/net/sourceforge/opencamera/ui/DrawPreview.java b/app/src/main/java/net/sourceforge/opencamera/ui/DrawPreview.java
index 269cf8813a051819f501678b11e8454869e9a016..717d5111af09abf1226c347dae4859bde0af9178 100644
--- a/app/src/main/java/net/sourceforge/opencamera/ui/DrawPreview.java
+++ b/app/src/main/java/net/sourceforge/opencamera/ui/DrawPreview.java
@@ -537,7 +537,7 @@ public class DrawPreview {
         show_geo_direction_pref = sharedPreferences.getBoolean(PreferenceKeys.ShowGeoDirectionPreferenceKey, false);
 
         take_photo_border_pref = sharedPreferences.getBoolean(PreferenceKeys.TakePhotoBorderPreferenceKey, true);
-        preview_size_wysiwyg_pref = sharedPreferences.getString(PreferenceKeys.PreviewSizePreferenceKey, "preference_preview_size_display").equals("preference_preview_size_wysiwyg");
+        preview_size_wysiwyg_pref = sharedPreferences.getString(PreferenceKeys.PreviewSizePreferenceKey, "preference_preview_size_wysiwyg").equals("preference_preview_size_wysiwyg");
         store_location_pref = sharedPreferences.getBoolean(PreferenceKeys.LocationPreferenceKey, false);
 
         show_angle_line_pref = sharedPreferences.getBoolean(PreferenceKeys.ShowAngleLinePreferenceKey, false);
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index d941e947cd98d6de404ffcba7cfe42d655744062..d7df2bd87f4bbeaab93cf37fa419c4f278e28cb0 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -329,7 +329,7 @@
                 android:summary="%s"
                 android:entries="@array/preference_preview_size_entries"
                 android:entryValues="@array/preference_preview_size_values"
-                android:defaultValue="preference_preview_size_display"
+                android:defaultValue="preference_preview_size_wysiwyg"
                 />
 
             <ListPreference