diff --git a/android/native/jni/input_android.c b/android/native/jni/input_android.c
index a6410eaf40..625f172d77 100644
--- a/android/native/jni/input_android.c
+++ b/android/native/jni/input_android.c
@@ -1855,7 +1855,7 @@ static int16_t android_input_state(void *data, const struct retro_keybind **bind
 
 static bool android_input_key_pressed(void *data, int key)
 {
-   return ((g_extern.lifecycle_state | driver.overlay_state) & (1ULL << key));
+   return ((g_extern.lifecycle_state | driver.overlay_state.buttons) & (1ULL << key));
 }
 
 static void android_input_free_input(void *data)
diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c
index 2651a2fc36..582daeb3ff 100644
--- a/frontend/menu/menu_common.c
+++ b/frontend/menu/menu_common.c
@@ -704,7 +704,7 @@ static uint64_t rgui_input(void)
 
 #ifdef HAVE_OVERLAY
    for (unsigned i = 0; i < DEVICE_NAV_LAST; i++)
-      input_state |= driver.overlay_state & menu_nav_binds[0][i].joykey ? (1ULL << i) : 0;
+      input_state |= driver.overlay_state.buttons & menu_nav_binds[0][i].joykey ? (1ULL << i) : 0;
 #endif
 #else
    static const int maps[] = {