diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNINative.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNINative.java
index 495bb9ce6..923b96ac7 100644
--- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNINative.java
+++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNINative.java
@@ -586,11 +586,6 @@ public class GL2JNINative extends NativeActivity {
 		moga.onDestroy();
 	}
 
-	@Override
-	protected void onStop() {
-		super.onStop();
-	}
-
 	@Override
 	public void onConfigurationChanged(Configuration newConfig) {
 		super.onConfigurationChanged(newConfig);
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GL2JNIView.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GL2JNIView.java
index 2853ac11f..872f65062 100644
--- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GL2JNIView.java
+++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GL2JNIView.java
@@ -681,6 +681,8 @@ public class GL2JNIView extends GLSurfaceView
     }
 
     public void onDestroy() {
+        // Workaround for ANR when returning to menu
+        System.exit(0);
         try {
             ethd.join();
         } catch (InterruptedException e) {