diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c
index 5fac2a4231..0fc5f80583 100644
--- a/menu/cbs/menu_cbs_left.c
+++ b/menu/cbs/menu_cbs_left.c
@@ -183,7 +183,7 @@ static int action_left_input_desc_kbd(unsigned type, const char *label,
    remap_id =
       settings->uints.input_keymapper_ids[user_idx][btn_idx];
 
-   for (key_id = 0; key_id < RARCH_MAX_KEYS - 1; key_id++)
+   for (key_id = 0; key_id < RARCH_MAX_KEYS; key_id++)
    {
       if (remap_id == key_descriptors[key_id].key)
          break;
@@ -192,7 +192,7 @@ static int action_left_input_desc_kbd(unsigned type, const char *label,
    if (key_id > 0)
       key_id--;
    else
-      key_id = (RARCH_MAX_KEYS - 1) + MENU_SETTINGS_INPUT_DESC_KBD_BEGIN;
+      key_id = RARCH_MAX_KEYS - 1;
 
    settings->uints.input_keymapper_ids[user_idx][btn_idx] = key_descriptors[key_id].key;
 
diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c
index 2bab568d48..17725658d8 100644
--- a/menu/cbs/menu_cbs_right.c
+++ b/menu/cbs/menu_cbs_right.c
@@ -154,13 +154,13 @@ static int action_right_input_desc_kbd(unsigned type, const char *label,
    remap_id =
       settings->uints.input_keymapper_ids[user_idx][btn_idx];
 
-   for (key_id = 0; key_id < RARCH_MAX_KEYS - 1; key_id++)
+   for (key_id = 0; key_id < RARCH_MAX_KEYS; key_id++)
    {
       if (remap_id == key_descriptors[key_id].key)
          break;
    }
 
-   if (key_id < (RARCH_MAX_KEYS - 1) + MENU_SETTINGS_INPUT_DESC_KBD_BEGIN)
+   if (key_id < (RARCH_MAX_KEYS - 1))
       key_id++;
    else
       key_id = 0;