diff --git a/frontend/menu/menu_entries.c b/frontend/menu/menu_entries.c
index 6c9666ea75..babdcc00a5 100644
--- a/frontend/menu/menu_entries.c
+++ b/frontend/menu/menu_entries.c
@@ -795,6 +795,9 @@ int menu_parse_and_resolve(file_list_t *list, file_list_t *menu_list)
    RARCH_LOG("label: %s\n", label);
 #endif
 
+   if (!strcmp(label, "deferred_core_list"))
+      return menu_entries_push_list(driver.menu, list, path, label, type);
+
    if (menu_parse_check(label, type) == -1)
       return - 1;
 
diff --git a/frontend/menu/menu_entries_cbs.c b/frontend/menu/menu_entries_cbs.c
index 0f60974169..3d9c84d1f7 100644
--- a/frontend/menu/menu_entries_cbs.c
+++ b/frontend/menu/menu_entries_cbs.c
@@ -333,21 +333,11 @@ static int action_ok_file_load_with_detect_core(const char *path,
       return -1;
    }
    else if (ret == 0)
-   {
-      file_list_push(
+      menu_entries_push(
             driver.menu->menu_stack,
             g_settings.libretro_directory,
             "deferred_core_list",
-            0,
-            driver.menu->selection_ptr);
-      menu_clear_navigation(driver.menu, true);
-      menu_entries_push_list(
-            driver.menu,
-            driver.menu->selection_buf,
-            g_settings.libretro_directory,
-            "deferred_core_list",
-            0);
-   }
+            0, driver.menu->selection_ptr);
 
    return ret;
 }