diff --git a/cheevos.c b/cheevos.c
index 70853f6130..d9291c9fdb 100644
--- a/cheevos.c
+++ b/cheevos.c
@@ -2190,7 +2190,8 @@ void cheevos_populate_menu(void *data)
          menu_hash_to_str_enum(MENU_ENUM_LABEL_CHEEVOS_UNLOCKED_ACHIEVEMENTS),
          MENU_ENUM_LABEL_CHEEVOS_UNLOCKED_ACHIEVEMENTS,
          MENU_SETTINGS_CHEEVOS_NONE, 0, 0);
-   menu_entries_add(info->list, "", "", MENU_SETTINGS_CHEEVOS_NONE, 0, 0);
+   menu_entries_add_enum(info->list, "", "", MENU_ENUM_LABEL_UNKNOWN,
+         MENU_SETTINGS_CHEEVOS_NONE, 0, 0);
 
    cheevo = cheevos_locals.core.cheevos;
    end    = cheevos_locals.core.cheevos + cheevos_locals.core.count;
@@ -2198,8 +2199,9 @@ void cheevos_populate_menu(void *data)
    for (i = 0; cheevo < end; i++, cheevo++)
    {
       if (!cheevo->active)
-         menu_entries_add(info->list, cheevo->title,
-               cheevo->description, MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
+         menu_entries_add_enum(info->list, cheevo->title,
+               cheevo->description, MENU_ENUM_LABEL_UNKNOWN, 
+               MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
    }
    
    if (settings->cheevos.test_unofficial)
@@ -2211,18 +2213,21 @@ void cheevos_populate_menu(void *data)
       for (i = cheevos_locals.core.count; cheevo < end; i++, cheevo++)
       {
          if (!cheevo->active)
-            menu_entries_add(info->list, cheevo->title,
-                  cheevo->description, MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
+            menu_entries_add_enum(info->list, cheevo->title,
+                  cheevo->description, MENU_ENUM_LABEL_UNKNOWN,
+                  MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
       }
    }
    
-   menu_entries_add(info->list, "", "", MENU_SETTINGS_CHEEVOS_NONE, 0, 0);
+   menu_entries_add_enum(info->list, "", "", MENU_ENUM_LABEL_UNKNOWN,
+         MENU_SETTINGS_CHEEVOS_NONE, 0, 0);
    menu_entries_add_enum(info->list,
          menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_CHEEVOS_LOCKED_ACHIEVEMENTS),
          menu_hash_to_str_enum(MENU_ENUM_LABEL_CHEEVOS_LOCKED_ACHIEVEMENTS),
          MENU_ENUM_LABEL_CHEEVOS_LOCKED_ACHIEVEMENTS,
          MENU_SETTINGS_CHEEVOS_NONE, 0, 0);
-   menu_entries_add(info->list, "", "", MENU_SETTINGS_CHEEVOS_NONE, 0, 0);
+   menu_entries_add_enum(info->list, "", "", MENU_ENUM_LABEL_UNKNOWN,
+         MENU_SETTINGS_CHEEVOS_NONE, 0, 0);
 
    cheevo = cheevos_locals.core.cheevos;
    end    = cheevos_locals.core.cheevos + cheevos_locals.core.count;
@@ -2230,8 +2235,9 @@ void cheevos_populate_menu(void *data)
    for (i = 0; cheevo < end; i++, cheevo++)
    {
       if (cheevo->active)
-         menu_entries_add(info->list, cheevo->title,
-               cheevo->description, MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
+         menu_entries_add_enum(info->list, cheevo->title,
+               cheevo->description, MENU_ENUM_LABEL_UNKNOWN,
+               MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
    }
    
    if (settings->cheevos.test_unofficial)
@@ -2243,8 +2249,9 @@ void cheevos_populate_menu(void *data)
       for (i = cheevos_locals.core.count; cheevo < end; i++, cheevo++)
       {
          if (cheevo->active)
-            menu_entries_add(info->list, cheevo->title,
-                  cheevo->description, MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
+            menu_entries_add_enum(info->list, cheevo->title,
+                  cheevo->description, MENU_ENUM_LABEL_UNKNOWN, 
+                  MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
       }
    }
 #endif
diff --git a/menu/drivers/nuklear.c b/menu/drivers/nuklear.c
index b452e5c046..44f2bf820b 100644
--- a/menu/drivers/nuklear.c
+++ b/menu/drivers/nuklear.c
@@ -390,8 +390,9 @@ static bool nk_menu_init_list(void *data)
    strlcpy(info.label,
          menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_HISTORY_TAB), sizeof(info.label));
 
-   menu_entries_add(menu_stack,
-         info.path, info.label, info.type, info.flags, 0);
+   menu_entries_add_enum(menu_stack,
+         info.path, info.label, MENU_ENUM_LABEL_UNKNOWN, 
+         info.type, info.flags, 0);
 
    command_event(CMD_EVENT_HISTORY_INIT, NULL);
 
diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c
index 0d5ae998e2..7c9a55d17d 100644
--- a/menu/drivers/zarch.c
+++ b/menu/drivers/zarch.c
@@ -1131,8 +1131,8 @@ static bool zarch_menu_init_list(void *data)
    strlcpy(info.label,
          menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_HISTORY_TAB), sizeof(info.label));
 
-   menu_entries_add(menu_stack,
-         info.path, info.label, info.type, info.flags, 0);
+   menu_entries_add_enum(menu_stack,
+         info.path, info.label, MENU_ENUM_LABEL_UNKNOWN, info.type, info.flags, 0);
 
    command_event(CMD_EVENT_HISTORY_INIT, NULL);