diff --git a/shell/android/AndroidManifest.xml b/shell/android/AndroidManifest.xml
index f4a50f4d8..0dce205aa 100644
--- a/shell/android/AndroidManifest.xml
+++ b/shell/android/AndroidManifest.xml
@@ -87,44 +87,6 @@
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="dc" />
-
-            <intent-filter>
-                <action android:name="com.reicast.LAUNCH_ROM" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="*"
-                    android:mimeType="*/*"
-                    android:pathPattern=".*\\.GDI"
-                    android:scheme="file" />
-                <data
-                    android:host="*"
-                    android:mimeType="*/*"
-                    android:pathPattern=".*\\.gdi"
-                    android:scheme="file" />
-                <data
-                    android:host="*"
-                    android:mimeType="*/*"
-                    android:pathPattern=".*\\.CHD"
-                    android:scheme="file" />
-                <data
-                    android:host="*"
-                    android:mimeType="*/*"
-                    android:pathPattern=".*\\.chd"
-                    android:scheme="file" />
-                <data
-                    android:host="*"
-                    android:mimeType="*/*"
-                    android:pathPattern=".*\\.CDI"
-                    android:scheme="file" />
-                <data
-                    android:host="*"
-                    android:mimeType="*/*"
-                    android:pathPattern=".*\\.cdi"
-                    android:scheme="file" />
-            </intent-filter>
         </activity>
         <activity
             android:name=".GL2JNINative"
@@ -137,44 +99,6 @@
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="sexplay" />
-
-            <intent-filter>
-                <action android:name="com.reicast.LAUNCH_ROM" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="*"
-                    android:mimeType="*/*"
-                    android:pathPattern=".*\\.GDI"
-                    android:scheme="file" />
-                <data
-                    android:host="*"
-                    android:mimeType="*/*"
-                    android:pathPattern=".*\\.gdi"
-                    android:scheme="file" />
-                <data
-                    android:host="*"
-                    android:mimeType="*/*"
-                    android:pathPattern=".*\\.CHD"
-                    android:scheme="file" />
-                <data
-                    android:host="*"
-                    android:mimeType="*/*"
-                    android:pathPattern=".*\\.chd"
-                    android:scheme="file" />
-                <data
-                    android:host="*"
-                    android:mimeType="*/*"
-                    android:pathPattern=".*\\.CDI"
-                    android:scheme="file" />
-                <data
-                    android:host="*"
-                    android:mimeType="*/*"
-                    android:pathPattern=".*\\.cdi"
-                    android:scheme="file" />
-            </intent-filter>
         </activity>
         <activity
             android:name=".config.EditVJoyActivity"
diff --git a/shell/android/src/com/reicast/emulator/GL2JNINative.java b/shell/android/src/com/reicast/emulator/GL2JNINative.java
index 9a7c3ee72..256acb609 100644
--- a/shell/android/src/com/reicast/emulator/GL2JNINative.java
+++ b/shell/android/src/com/reicast/emulator/GL2JNINative.java
@@ -12,6 +12,7 @@ import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.util.Log;
 import android.view.Gravity;
@@ -174,9 +175,13 @@ public class GL2JNINative extends NativeActivity {
 //						} else {
 //							pad.map[playerNum] = pad.getConsoleController();
 //						}
-						Toast.makeText(getApplicationContext(), R.string.controller_unavailable,
-								Toast.LENGTH_SHORT).show();
-						finish();
+						new Handler().post(new Runnable() {
+							public void run() {
+								Toast.makeText(getApplicationContext(), R.string.controller_unavailable,
+										Toast.LENGTH_SHORT).show();
+								finish();
+							}
+						});
 					} else if (InputDevice.getDevice(joy).getName()
 							.contains(Gamepad.controllers_play) ) {
 						for (int keys : pad.keypadZeus) {
diff --git a/shell/android/src/com/reicast/emulator/MainActivity.java b/shell/android/src/com/reicast/emulator/MainActivity.java
index 8733aa973..6b9e4ae0d 100644
--- a/shell/android/src/com/reicast/emulator/MainActivity.java
+++ b/shell/android/src/com/reicast/emulator/MainActivity.java
@@ -420,10 +420,10 @@ public class MainActivity extends SlidingFragmentActivity implements
 		} else {
 			Config.nativeact = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getBoolean(Config.pref_nativeact, Config.nativeact);
 			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD && Config.nativeact) {
-				startActivity(new Intent("com.reciast.LAUNCH_ROM", uri, getApplicationContext(),
+				startActivity(new Intent("com.reicast.EMULATOR", uri, getApplicationContext(),
 						GL2JNINative.class));
 			} else {
-				startActivity(new Intent("com.reciast.LAUNCH_ROM", uri, getApplicationContext(),
+				startActivity(new Intent("com.reicast.EMULATOR", uri, getApplicationContext(),
 						GL2JNIActivity.class));
 			}
 		}