diff --git a/android/native/jni/input_android.c b/android/native/jni/input_android.c
index ee3d722449..0597d856db 100644
--- a/android/native/jni/input_android.c
+++ b/android/native/jni/input_android.c
@@ -367,12 +367,14 @@ 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)
@@ -461,6 +463,11 @@ static void android_input_poll(void *data)
       else if (ident == LOOPER_ID_MAIN)
          engine_handle_cmd();
    }
+
+   if (!(g_extern.frame_count < g_extern.delay_timer[0]) && g_extern.lifecycle_state & (1ULL << RARCH_RMENU_TOGGLE))
+   {
+      g_extern.lifecycle_state |= (1ULL << RARCH_QUIT_KEY);
+   }
 }
 
 static int16_t android_input_state(void *data, const struct retro_keybind **binds, unsigned port, unsigned device, unsigned index, unsigned id)
diff --git a/android/native/jni/input_autodetect.c b/android/native/jni/input_autodetect.c
index 568d6d98b7..fd987d5791 100644
--- a/android/native/jni/input_autodetect.c
+++ b/android/native/jni/input_autodetect.c
@@ -139,7 +139,11 @@ void input_autodetect_setup (void *data, char *msg, size_t sizeof_msg, unsigned
       }
    }
 
+#if 0
    keycode_lut[AKEYCODE_MENU] |= ((RARCH_RMENU_TOGGLE + 1) << shift);
+#else
+   keycode_lut[AKEYCODE_BACK] |= ((RARCH_RMENU_TOGGLE + 1) << shift);
+#endif
 
    if (g_settings.input.autodetect_enable)
    {