diff --git a/menu/menu_entries_cbs_cancel.c b/menu/menu_entries_cbs_cancel.c
index 4630901698..0c7db30025 100644
--- a/menu/menu_entries_cbs_cancel.c
+++ b/menu/menu_entries_cbs_cancel.c
@@ -19,12 +19,6 @@
 #include "menu_entry.h"
 #include "menu_setting.h"
 
-static int action_cancel_lookup_setting(const char *path,
-      const char *label, unsigned type, size_t idx)
-{
-   return menu_setting_set(type, label, MENU_ACTION_CANCEL, false);
-}
-
 static int action_cancel_pop_default(const char *path,
       const char *label, unsigned type, size_t idx)
 {
@@ -38,8 +32,5 @@ void menu_entries_cbs_init_bind_cancel(menu_file_list_cbs_t *cbs,
    if (!cbs)
       return;
 
-   cbs->action_cancel = action_cancel_lookup_setting;
-
-   /* TODO - add some stuff here. */
    cbs->action_cancel = action_cancel_pop_default;
 }
diff --git a/menu/menu_input.c b/menu/menu_input.c
index 37859f7492..3a2fee5cbd 100644
--- a/menu/menu_input.c
+++ b/menu/menu_input.c
@@ -522,11 +522,10 @@ int menu_input_bind_iterate_keyboard(void)
 
    if (timeout <= 0)
    {
-      menu->binds.begin++;
-
       /* Could be unsafe, but whatever. */
       menu->binds.target->key = RETROK_UNKNOWN;
 
+      menu->binds.begin++;
       menu->binds.target++;
       menu->binds.timeout_end = rarch_get_time_usec() +
          MENU_KEYBOARD_BIND_TIMEOUT_SECONDS * 1000000;