diff --git a/menu/menu_input.c b/menu/menu_input.c
index 66de0cbc0a..17fb9969fe 100644
--- a/menu/menu_input.c
+++ b/menu/menu_input.c
@@ -621,7 +621,10 @@ static bool menu_input_key_bind_iterate(char *s, size_t len)
       binds.begin++;
 
       if (binds.begin > binds.last)
+      {
+         input_keyboard_wait_keys_cancel();
          return true;
+      }
 
       binds.target++;
       binds.timeout_end = retro_get_time_usec() +