diff --git a/frontend/frontend.c b/frontend/frontend.c
index 62b0fecd1a..c6dd5790bf 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -115,13 +115,7 @@ static int main_entry_iterate_content(args_type() args)
 
 static int main_entry_iterate_load_content(args_type() args)
 {
-   if (load_menu_content())
-   {
-      g_extern.lifecycle_state |= (1ULL << MODE_GAME);
-      if (driver.video_data && driver.video_poke && driver.video_poke->set_aspect_ratio)
-         driver.video_poke->set_aspect_ratio(driver.video_data, g_settings.video.aspect_ratio_idx);
-   }
-   else
+   if (!load_menu_content())
    {
 #if defined(RARCH_CONSOLE) || defined(RARCH_MOBILE)
       // If ROM load fails, we go back to menu.
diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c
index a98336a617..563ce87776 100644
--- a/frontend/menu/menu_common.c
+++ b/frontend/menu/menu_common.c
@@ -222,6 +222,11 @@ bool load_menu_content(void)
    if (driver.menu_ctx && driver.menu_ctx->backend && driver.menu_ctx->backend->shader_manager_init)
       driver.menu_ctx->backend->shader_manager_init(driver.menu);
 
+   if (driver.video_data && driver.video_poke && driver.video_poke->set_aspect_ratio)
+      driver.video_poke->set_aspect_ratio(driver.video_data, g_settings.video.aspect_ratio_idx);
+
+   g_extern.lifecycle_state |= (1ULL << MODE_GAME);
+
    return true;
 }