diff --git a/android/native/jni/input_android.c b/android/native/jni/input_android.c
index 0597d856db..db6d9aedff 100644
--- a/android/native/jni/input_android.c
+++ b/android/native/jni/input_android.c
@@ -367,14 +367,12 @@ static void android_input_poll(void *data)
                         && input_state > 0)
                   {
                   }
-#if 0
                   else
                   {
                      *lifecycle_state |= (1ULL << RARCH_QUIT_KEY);
                      AInputQueue_finishEvent(android_app->inputQueue, event, handled);
                      break;
                   }
-#endif
                }
 
                if (type_event == AINPUT_EVENT_TYPE_MOTION)
diff --git a/android/native/jni/input_autodetect.c b/android/native/jni/input_autodetect.c
index 7baede6681..0b21cea32a 100644
--- a/android/native/jni/input_autodetect.c
+++ b/android/native/jni/input_autodetect.c
@@ -320,7 +320,7 @@ void input_autodetect_setup (void *data, char *msg, size_t sizeof_msg, unsigned
          keycode_lut[AKEYCODE_EQUALS] |= ((RETRO_DEVICE_ID_JOYPAD_SELECT+1) << shift);
 
          // use this for the RGUI toggle
-         //keycode_lut[AKEYCODE_MENU] |=  ((RETRO_DEVICE_ID_JOYPAD_START+1)      << shift);
+         keycode_lut[AKEYCODE_MENU] |=  ((RARCH_RMENU_TOGGLE+1)      << shift);
 
          // Left Analog Up: 152
          // Left Analog Down: 146
@@ -493,7 +493,7 @@ void input_autodetect_setup (void *data, char *msg, size_t sizeof_msg, unsigned
          else
          {
             //PS button will be used for RGUI toggle
-            //keycode_lut[AKEYCODE_BUTTON_1] |= ((RETRO_DEVICE_ID_JOYPAD_B+1)     << shift);
+            keycode_lut[AKEYCODE_BUTTON_1] |= ((RARCH_RMENU_TOGGLE+1)     << shift);
             keycode_lut[AKEYCODE_BUTTON_X] |=  ((RETRO_DEVICE_ID_JOYPAD_B+1)      << shift);
             keycode_lut[AKEYCODE_BUTTON_A] |=  ((RETRO_DEVICE_ID_JOYPAD_Y+1)      << shift);
          }