diff --git a/android/phoenix/AndroidManifest.xml b/android/phoenix/AndroidManifest.xml
index d0dc0587b0..4f6243d63f 100644
--- a/android/phoenix/AndroidManifest.xml
+++ b/android/phoenix/AndroidManifest.xml
@@ -32,6 +32,7 @@
         <activity android:name=".browser.FileWrapper"></activity>
         <activity android:name=".browser.DirectoryActivity"></activity>
         <activity android:name=".browser.ROMActivity"></activity>
+        <activity android:name=".browser.RetroTVMode"></activity>
         
         <activity android:name=".browser.ShaderActivity"></activity>
         <activity android:name=".browser.OverlayActivity"></activity>
diff --git a/android/phoenix/res/xml/prefs.xml b/android/phoenix/res/xml/prefs.xml
index 0b3142b73c..6a2ae26e9e 100644
--- a/android/phoenix/res/xml/prefs.xml
+++ b/android/phoenix/res/xml/prefs.xml
@@ -2,7 +2,12 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     android:title="RetroArch 0.9.9.5 - Main Menu" >
 
-    <PreferenceScreen android:title="Select Game">
+    <PreferenceScreen android:title="TV Mode">
+       <intent
+          android:targetClass="org.retroarch.browser.RetroTVMode"
+          android:targetPackage="org.retroarch" />
+    </PreferenceScreen>
+    <PreferenceScreen android:title="Load Game">
        <intent
           android:targetClass="org.retroarch.browser.CoreSelection"
           android:targetPackage="org.retroarch" />
diff --git a/android/phoenix/src/org/retroarch/browser/RetroTVMode.java b/android/phoenix/src/org/retroarch/browser/RetroTVMode.java
new file mode 100644
index 0000000000..a2ee4372e3
--- /dev/null
+++ b/android/phoenix/src/org/retroarch/browser/RetroTVMode.java
@@ -0,0 +1,19 @@
+package org.retroarch.browser;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Intent;
+import android.os.Bundle;
+import android.provider.Settings;
+
+public class RetroTVMode extends Activity {
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		Intent myIntent = new Intent(this, RetroActivity.class);
+		startActivity(myIntent);
+		finish();
+	}
+}
+
+
diff --git a/frontend/frontend_android.c b/frontend/frontend_android.c
index a1b26f45f2..734888ef48 100644
--- a/frontend/frontend_android.c
+++ b/frontend/frontend_android.c
@@ -153,9 +153,16 @@ static bool android_app_start_main(struct android_app *android_app)
    config_load();
 
    menu_init();
-   ret = load_menu_game();
-   if (ret)
-      g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME);
+
+   if *(g_extern.fullpath)
+   {
+      ret = load_menu_game();
+      if (ret)
+         g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME);
+   }
+   else
+      g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU);
+
    return ret;
 }