diff --git a/shell/android/src/com/reicast/emulator/GL2JNIActivity.java b/shell/android/src/com/reicast/emulator/GL2JNIActivity.java
index ad5a5e3cd..6c7a1e122 100644
--- a/shell/android/src/com/reicast/emulator/GL2JNIActivity.java
+++ b/shell/android/src/com/reicast/emulator/GL2JNIActivity.java
@@ -190,7 +190,7 @@ public class GL2JNIActivity extends Activity {
 		if (pad.isXperiaPlay) {
 			menu_spec = getApplicationContext().getString(R.string.menu_button);
 		} else if (pad.isOuyaOrTV) {
-			menu_spec = getApplicationContext().getString(R.string.right_button);
+			menu_spec = getApplicationContext().getString(R.string.menu_button);
 		} else {
 			menu_spec = getApplicationContext().getString(R.string.back_button);
 		}
@@ -520,7 +520,7 @@ public class GL2JNIActivity extends Activity {
 				return showMenu();
 			}
 		}
-		if (keyCode == KeyEvent.KEYCODE_BACK) {
+		if (keyCode == KeyEvent.KEYCODE_BACK || keyCode == OuyaController.BUTTON_MENU) {
 			if (pad.isXperiaPlay) {
 				return true;
 			} else {
diff --git a/shell/android/src/com/reicast/emulator/periph/Gamepad.java b/shell/android/src/com/reicast/emulator/periph/Gamepad.java
index 058fa1556..d855c4d5d 100644
--- a/shell/android/src/com/reicast/emulator/periph/Gamepad.java
+++ b/shell/android/src/com/reicast/emulator/periph/Gamepad.java
@@ -97,9 +97,7 @@ public class Gamepad {
 				OuyaController.BUTTON_DPAD_LEFT, 	key_CONT_DPAD_LEFT,
 				OuyaController.BUTTON_DPAD_RIGHT, 	key_CONT_DPAD_RIGHT,
 				
-				OuyaController.BUTTON_MENU, 		key_CONT_START,
-				getStartButtonCode(), 				key_CONT_START,
-				OuyaController.BUTTON_R3, 			getSelectButtonCode()
+				OuyaController.BUTTON_R3, 			key_CONT_START,
 		};
 	}