diff --git a/app/src/main/java/com/takisoft/preferencefix/MyPreferenceFragment.java b/app/src/main/java/com/takisoft/preferencefix/MyPreferenceFragment.java
index 7131c41..7fbeae9 100644
--- a/app/src/main/java/com/takisoft/preferencefix/MyPreferenceFragment.java
+++ b/app/src/main/java/com/takisoft/preferencefix/MyPreferenceFragment.java
@@ -5,6 +5,7 @@
 import android.support.annotation.Nullable;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
+import android.support.v7.preference.PreferenceManagerFix;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -19,6 +20,7 @@ public class MyPreferenceFragment extends PreferenceFragmentCompatDividers {
 
     @Override
     public void onCreatePreferencesFix(@Nullable Bundle savedInstanceState, String rootKey) {
+        PreferenceManagerFix.setDefaultValues(getPreferenceManager().getContext(), R.xml.settings, false);
         setPreferencesFromResource(R.xml.settings, rootKey);
 
         testDynamicPrefs();
@@ -30,7 +32,7 @@ public void onCreatePreferencesFix(@Nullable Bundle savedInstanceState, String r
 
         Preference prefEmptyCheck = findPreference("pref_empty_check");
 
-        if(prefEmptyCheck != null) {
+        if (prefEmptyCheck != null) {
             prefEmptyCheck.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
                 @Override
                 public boolean onPreferenceChange(Preference preference, Object newValue) {
diff --git a/app/src/main/res/values/test_list_entries.xml b/app/src/main/res/values/test_list_entries.xml
index 2721260..b07d698 100644
--- a/app/src/main/res/values/test_list_entries.xml
+++ b/app/src/main/res/values/test_list_entries.xml
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <string-array name="pref_list_entries">
         <item>Alpha</item>
         <item>Bravo</item>
         <item>Charlie</item>
     </string-array>
+
     <string-array name="pref_list_values">
         <item>A</item>
         <item>B</item>
         <item>C</item>
     </string-array>
+
+    <string name="pref_list_default_value" translatable="false">B</string>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
index fa3a8e4..f47ac6f 100644
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -138,7 +138,7 @@
             android:title="ColorPickerPreference"
             app:pref_size="small" />
         <SimpleMenuPreference
-            android:defaultValue="1"
+            android:defaultValue="@string/pref_list_default_value"
             android:entries="@array/pref_list_entries"
             android:entryValues="@array/pref_list_values"
             android:key="pref_simple_menu"
diff --git a/preference-v7/src/main/java/android/support/v7/preference/PreferenceManagerFix.java b/preference-v7/src/main/java/android/support/v7/preference/PreferenceManagerFix.java
index 4671e85..dc40ada 100644
--- a/preference-v7/src/main/java/android/support/v7/preference/PreferenceManagerFix.java
+++ b/preference-v7/src/main/java/android/support/v7/preference/PreferenceManagerFix.java
@@ -1,7 +1,9 @@
 package android.support.v7.preference;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.support.annotation.NonNull;
 import android.support.v4.content.SharedPreferencesCompat;
 
 import java.lang.reflect.Field;
@@ -100,4 +102,25 @@ private void setNoCommitFix(boolean noCommit) throws IllegalAccessException {
 
         this.noCommit = noCommit;
     }
+
+    @SuppressLint("RestrictedApi")
+    public static void setDefaultValues(@NonNull Context context, int resId, boolean readAgain) {
+
+        final String sharedPreferencesName = context.getPackageName() + "_preferences";  // PreferenceManager.getDefaultSharedPreferencesName()
+        final int sharedPreferencesMode = Context.MODE_PRIVATE;                          // PreferenceManager.getDefaultSharedPreferencesMode()
+
+        final SharedPreferences defaultValueSp = context.getSharedPreferences(KEY_HAS_SET_DEFAULT_VALUES, Context.MODE_PRIVATE);
+
+        if (readAgain || !defaultValueSp.getBoolean(KEY_HAS_SET_DEFAULT_VALUES, false)) {
+            final PreferenceManagerFix pm = new PreferenceManagerFix(context);
+            pm.setSharedPreferencesName(sharedPreferencesName);
+            pm.setSharedPreferencesMode(sharedPreferencesMode);
+            pm.inflateFromResource(context, resId, null);
+
+            defaultValueSp.edit()
+                    .putBoolean(PreferenceManager.KEY_HAS_SET_DEFAULT_VALUES, true)
+                    .apply();
+        }
+    }
+
 }