diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
index 215162cf77..6557e3f982 100644
--- a/menu/cbs/menu_cbs_get_value.c
+++ b/menu/cbs/menu_cbs_get_value.c
@@ -618,8 +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 < MENU_SETTINGS_INPUT_DESC_KBD_END - 
-      MENU_SETTINGS_INPUT_DESC_KBD_BEGIN; key_id++)
+   for (key_id = 0; key_id < RARCH_MAX_KEYS; key_id++)
    {
       if(remap_id == key_descriptors[key_id].key)
          break;