diff --git a/driver.c b/driver.c
index 2879541aa2..5243f1a112 100644
--- a/driver.c
+++ b/driver.c
@@ -394,9 +394,7 @@ void init_drivers(int flags)
    if (flags & DRIVER_MENU)
    {
       init_menu();
-
-      if (driver->menu_ctx && driver->menu_ctx->context_reset)
-         driver->menu_ctx->context_reset();
+      menu_driver_context_reset();
    }
 #endif
 
diff --git a/menu/menu.c b/menu/menu.c
index 1836be721e..3ad5d1b11b 100644
--- a/menu/menu.c
+++ b/menu/menu.c
@@ -76,16 +76,12 @@ static void draw_frame(void)
  **/
 static void menu_update_libretro_info(struct retro_system_info *info)
 {
-   driver_t *driver = driver_get_ptr();
 #ifndef HAVE_DYNAMIC
    retro_get_system_info(info);
 #endif
 
    rarch_main_command(RARCH_CMD_CORE_INFO_INIT);
-
-   if (driver->menu_ctx && driver->menu_ctx->context_reset)
-      driver->menu_ctx->context_reset();
-
+   menu_driver_context_reset();
    rarch_main_command(RARCH_CMD_LOAD_CORE_PERSIST);
 }