diff --git a/menu/menu.c b/menu/menu.c
index 2e68e3d323..07b49b28bf 100644
--- a/menu/menu.c
+++ b/menu/menu.c
@@ -63,10 +63,7 @@ void menu_update_libretro_info(struct retro_system_info *info)
    retro_get_system_info(info);
 #endif
 
-   core_info_list_free(g_extern.core_info);
-   g_extern.core_info = NULL;
-   if (*g_settings.libretro_directory)
-      g_extern.core_info = core_info_list_new(g_settings.libretro_directory);
+   rarch_main_command(RARCH_CMD_CORE_INFO_INIT);
    if (driver.menu_ctx && driver.menu_ctx->context_reset)
       driver.menu_ctx->context_reset();
 
diff --git a/retroarch.c b/retroarch.c
index 1a8d46f019..41ad4227f7 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2436,7 +2436,7 @@ bool rarch_main_command(unsigned cmd)
       case RARCH_CMD_CORE_INFO_INIT:
          rarch_main_command(RARCH_CMD_CORE_INFO_DEINIT);
 
-         if (*g_settings.libretro_directory && !g_extern.core_info)
+         if (*g_settings.libretro_directory)
             g_extern.core_info = core_info_list_new(g_settings.libretro_directory);
          break;
       case RARCH_CMD_CORE_DEINIT: