diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNIActivity.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNIActivity.java
index e3342763d..df4e0380c 100644
--- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNIActivity.java
+++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNIActivity.java
@@ -572,17 +572,18 @@ public class GL2JNIActivity extends Activity {
 	@Override
 	protected void onDestroy() {
 		super.onDestroy();
-		moga.onDestroy();
 		if (serviceRunning(EmuService.class))
 			stopService(serviceIntent);
+		mView.onDestroy();
 		JNIdc.stop();
+		moga.onDestroy();
 	}
 
 	@Override
 	protected void onStop() {
 		// TODO Auto-generated method stub
-		mView.onStop();
 		super.onStop();
+//		mView.onStop();
 	}
 
 	@Override
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 7067b4a53..a6f4492ef 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
@@ -573,14 +573,15 @@ public class GL2JNINative extends NativeActivity {
 	@Override
 	protected void onDestroy() {
 		super.onDestroy();
+		mView.onDestroy();
+		JNIdc.stop();
 		moga.onDestroy();
 	}
 
 	@Override
 	protected void onStop() {
-		JNIdc.stop();
-		mView.onStop();
 		super.onStop();
+//		mView.onStop();
 	}
 
 	@Override
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/EditVJoyActivity.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/EditVJoyActivity.java
index cbe3b2cb1..86bee746b 100644
--- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/EditVJoyActivity.java
+++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/EditVJoyActivity.java
@@ -76,16 +76,21 @@ public class EditVJoyActivity extends Activity {
 
 	@Override
 	protected void onStop() {
-		mView.onStop();
 		super.onStop();
+//		mView.onStop();
 	}
 
-
 	@Override
 	protected void onResume() {
 		super.onResume();
 		mView.onResume();
 	}
+
+	@Override
+	protected void onDestroy() {
+		super.onDestroy();
+		mView.onDestroy();
+	}
 	
 	PopupWindow createVJoyPopup() {
 		final PopupWindow popUp = new PopupWindow(this);
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 bc4bbc9b4..d98dccec5 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
@@ -693,7 +693,18 @@ public class GL2JNIView extends GLSurfaceView
 
 	}
 
-	public void onStop() {
+//	public void onStop() {
+//		// TODO Auto-generated method stub
+//		System.exit(0);
+//		try {
+//			ethd.join();
+//		} catch (InterruptedException e) {
+//			// TODO Auto-generated catch block
+//			e.printStackTrace();
+//		}
+//	}
+
+	public void onDestroy() {
 		// TODO Auto-generated method stub
 		System.exit(0);
 		try {