diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
index 6557e3f982..6ccfb0f31a 100644
--- a/menu/cbs/menu_cbs_get_value.c
+++ b/menu/cbs/menu_cbs_get_value.c
@@ -618,7 +618,7 @@ static void menu_action_setting_disp_set_label_input_desc_kbd(
    remap_id =
       settings->uints.input_keymapper_ids[offset][id];
 
-   for (key_id = 0; key_id < RARCH_MAX_KEYS; key_id++)
+   for (key_id = 0; key_id < RARCH_MAX_KEYS - 1; key_id++)
    {
       if(remap_id == key_descriptors[key_id].key)
          break;
diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c
index 04a403ca2e..6e306b3b97 100644
--- a/menu/cbs/menu_cbs_left.c
+++ b/menu/cbs/menu_cbs_left.c
@@ -394,8 +394,7 @@ static int action_left_input_desc_kbd(unsigned type, const char *label,
    remap_id =
       settings->uints.input_keymapper_ids[offset][id];
 
-   for (key_id = 0; key_id < RARCH_MAX_KEYS +
-      MENU_SETTINGS_INPUT_DESC_KBD_BEGIN; key_id++)
+   for (key_id = 0; key_id < RARCH_MAX_KEYS - 1; key_id++)
    {
       if(remap_id == key_descriptors[key_id].key)
          break;
diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c
index 0f2fa245a6..fd5c9ff8f1 100644
--- a/menu/cbs/menu_cbs_right.c
+++ b/menu/cbs/menu_cbs_right.c
@@ -120,8 +120,7 @@ int action_right_input_desc_kbd(unsigned type, const char *label,
    remap_id =
       settings->uints.input_keymapper_ids[offset][id];
 
-   for (key_id = 0; key_id < MENU_SETTINGS_INPUT_DESC_KBD_END - 
-      MENU_SETTINGS_INPUT_DESC_KBD_BEGIN; key_id++)
+   for (key_id = 0; key_id < RARCH_MAX_KEYS - 1; key_id++)
    {
       if(remap_id == key_descriptors[key_id].key)
          break;