diff --git a/input/input_driver.c b/input/input_driver.c
index 8fcd5a6949..504f25a1a3 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -823,9 +823,6 @@ uint64_t input_menu_keys_pressed(
       }
    }
 
-   if (menu_driver_is_binding_state())
-      *trigger_input = 0;
-
    *nonblock_state = input_driver_nonblock_state;
 
    return ret;
diff --git a/retroarch.c b/retroarch.c
index ae50dc02e6..fe2e6b9009 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2258,6 +2258,11 @@ static enum runloop_state runloop_check_state(
 
    video_driver_get_status(&frame_count, &is_alive, &is_focused);
 
+#ifdef HAVE_MENU
+   if (menu_driver_is_binding_state())
+      current_input = 0;
+#endif
+
 #ifdef HAVE_OVERLAY
    /* Check next overlay */
    {
@@ -2398,6 +2403,7 @@ static enum runloop_state runloop_check_state(
    if (runloop_idle)
       return RUNLOOP_STATE_SLEEP;
 
+
    /* Check game focus toggle */
    {
       static bool old_pressed = false;