diff --git a/input/input_driver.c b/input/input_driver.c
index 9b7cc82dd2..3551f25a3e 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -31,6 +31,7 @@
 
 #ifdef HAVE_MENU
 #include "../menu/menu_driver.h"
+#include "../menu/menu_input.h"
 #include "../menu/widgets/menu_input_dialog.h"
 #endif
 
@@ -562,9 +563,6 @@ uint64_t input_menu_keys_pressed(void *data, uint64_t last_input)
    const struct retro_keybind *binds_auto       = NULL;
    unsigned max_users                           = input_driver_max_users;
 
-   if (settings->bools.menu_unified_controls && !menu_input_dialog_get_display_kb())
-      return input_keys_pressed(settings, last_input);
-
    for (i = 0; i < max_users; i++)
    {
       struct retro_keybind *auto_binds          = input_autoconf_binds[i];
diff --git a/retroarch.c b/retroarch.c
index 6a55593b20..99a94efcb1 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2306,7 +2306,7 @@ static enum runloop_state runloop_check_state(
    bool menu_driver_binding_state   = menu_driver_is_binding_state();
    bool menu_is_alive               = menu_driver_is_alive();
    uint64_t current_input           =
-      menu_is_alive ? 
+      menu_is_alive && !(settings->bools.menu_unified_controls && !menu_input_dialog_get_display_kb())? 
       input_menu_keys_pressed(settings, last_input) :
       input_keys_pressed(settings, last_input);
 #else