diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c
index 1400c5d906..302dd1ab93 100644
--- a/frontend/menu/backend/menu_common_backend.c
+++ b/frontend/menu/backend/menu_common_backend.c
@@ -1286,7 +1286,7 @@ static int menu_setting_ok_toggle(unsigned type,
    }
    else if (
          menu_common_type_is(label, type) == MENU_SETTINGS ||
-         type == MENU_SETTINGS_CORE ||
+         !strcmp(label, "core_list") ||
          type == MENU_SETTINGS_CONFIG ||
          type == MENU_SETTINGS_DISK_APPEND
          )
@@ -1880,7 +1880,7 @@ static int menu_action_ok(const char *dir,
          menu_flush_stack_type(driver.menu->menu_stack,MENU_SETTINGS);
          return -1;
       }
-      else if (menu_type == MENU_SETTINGS_CORE)
+      else if (!strcmp(menu_label, "core_list"))
       {
          fill_pathname_join(g_settings.libretro, dir, path,
                sizeof(g_settings.libretro));
diff --git a/frontend/menu/disp/rgui.c b/frontend/menu/disp/rgui.c
index 87e7c500ca..bfbda45bb9 100644
--- a/frontend/menu/disp/rgui.c
+++ b/frontend/menu/disp/rgui.c
@@ -401,7 +401,7 @@ static void rgui_render(void)
       else
 #endif
       /* Pretty-print libretro cores from menu. */
-      if (menu_type == MENU_SETTINGS_CORE ||
+      if (!strcmp(label, "core_list") ||
             menu_type == MENU_SETTINGS_DEFERRED_CORE)
       {
          if (type == MENU_FILE_PLAIN)
diff --git a/frontend/menu/disp/rmenu.c b/frontend/menu/disp/rmenu.c
index 6534517e55..053116f031 100644
--- a/frontend/menu/disp/rmenu.c
+++ b/frontend/menu/disp/rmenu.c
@@ -270,7 +270,7 @@ static void rmenu_render(void)
 #endif
       /* Pretty-print libretro cores from menu. */
       if (
-            menu_type == MENU_SETTINGS_CORE ||
+            !strcmp(label, "core_list") ||
             menu_type == MENU_SETTINGS_DEFERRED_CORE)
       {
          if (type == MENU_FILE_PLAIN)
diff --git a/frontend/menu/disp/rmenu_xui.cpp b/frontend/menu/disp/rmenu_xui.cpp
index adecca6188..780f7c07f4 100644
--- a/frontend/menu/disp/rmenu_xui.cpp
+++ b/frontend/menu/disp/rmenu_xui.cpp
@@ -469,7 +469,7 @@ static void rmenu_xui_render(void)
       }
       else
       // Pretty-print libretro cores from menu.
-      if (menu_type == MENU_SETTINGS_CORE ||
+      if (!strcmp(label, "core_list") ||
             menu_type == MENU_SETTINGS_DEFERRED_CORE)
       {
          if (type == MENU_FILE_PLAIN)
diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h
index 84673b7226..2409a7fb60 100644
--- a/frontend/menu/menu_common.h
+++ b/frontend/menu/menu_common.h
@@ -105,7 +105,6 @@ typedef enum
    MENU_SETTINGS_SHADER_PRESET_SAVE,
 
    // settings options are done here too
-   MENU_SETTINGS_CORE,
    MENU_SETTINGS_DEFERRED_CORE,
    MENU_SETTINGS_CONFIG,
    MENU_SETTINGS_CORE_OPTIONS,
diff --git a/frontend/menu/menu_entries.c b/frontend/menu/menu_entries.c
index ce7eed208b..d34975d789 100644
--- a/frontend/menu/menu_entries.c
+++ b/frontend/menu/menu_entries.c
@@ -102,7 +102,7 @@ int menu_entries_push_list(menu_handle_t *menu,
    {
       setting_data = (rarch_setting_t *)setting_data_get_mainmenu(true);
       file_list_clear(list);
-      add_setting_entry(menu,list,"core_list", MENU_SETTINGS_CORE, setting_data);
+      add_setting_entry(menu,list,"core_list", 0, setting_data);
       add_setting_entry(menu,list,"history_list", 0, setting_data);
       add_setting_entry(menu,list,"detect_core_list", 0, setting_data);
       add_setting_entry(menu,list,"load_content", 0, setting_data);
@@ -582,7 +582,7 @@ int menu_parse_check(const char *label, unsigned menu_type)
             menu_type == MENU_CONTENT_HISTORY_PATH ||
             !strcmp(label, "video_filter") ||
             !strcmp(label, "audio_dsp_plugin") ||
-            menu_type == MENU_SETTINGS_CORE ||
+            !strcmp(label, "core_list") ||
             menu_type == MENU_SETTINGS_CONFIG ||
             menu_type == MENU_SETTINGS_DISK_APPEND)))
       return -1;