diff --git a/android/phoenix/res/xml/prefs.xml b/android/phoenix/res/xml/prefs.xml
index c3dfeb6dce..7c7f9113aa 100644
--- a/android/phoenix/res/xml/prefs.xml
+++ b/android/phoenix/res/xml/prefs.xml
@@ -39,10 +39,15 @@
     </PreferenceScreen>
     <PreferenceScreen android:title="System Settings" >
         <PreferenceCategory android:title="General" >
+            <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="savestate_auto_load"
+                android:summary="Loads an automatically created savestate at startup."
+                android:title="Auto load state" />
             <CheckBoxPreference
                 android:defaultValue="false"
                 android:key="savestate_auto_save"
-                android:summary="Automatically saves and restores game state."
+                android:summary="Automatically saves state when exiting game."
                 android:title="Auto save state" />
         </PreferenceCategory>
         <PreferenceCategory android:title="Rewinding" >
diff --git a/android/phoenix/src/org/retroarch/browser/RetroArch.java b/android/phoenix/src/org/retroarch/browser/RetroArch.java
index 2e44f912ba..4e818a514a 100644
--- a/android/phoenix/src/org/retroarch/browser/RetroArch.java
+++ b/android/phoenix/src/org/retroarch/browser/RetroArch.java
@@ -214,6 +214,7 @@ public class RetroArch extends Activity implements
 		config.setBoolean("audio_enable", prefs.getBoolean("audio_enable", true));
 		config.setBoolean("video_smooth", prefs.getBoolean("video_smooth", true));
 		config.setBoolean("video_allow_rotate", prefs.getBoolean("video_allow_rotate", true));
+		config.setBoolean("savestate_auto_load", prefs.getBoolean("savestate_auto_load", false));
 		config.setBoolean("savestate_auto_save", prefs.getBoolean("savestate_auto_save", false));
 		config.setBoolean("rewind_enable", prefs.getBoolean("rewind_enable", false));
 		config.setBoolean("video_vsync", prefs.getBoolean("video_vsync", true));