diff --git a/frontend/frontend.c b/frontend/frontend.c
index 9b1bf959b4..ebfce8fed9 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -197,21 +197,23 @@ int rarch_main(int argc, char *argv[])
 
    rarch_get_environment(argc, argv);
 
+#ifndef RARCH_CONSOLE
+   rarch_init_msg_queue();
+   int init_ret;
+   if ((init_ret = rarch_main_init(argc, argv))) return init_ret;
+#endif
+
 #ifdef HAVE_MENU
-#ifdef RARCH_CONSOLE
    menu_init();
+
+#ifdef RARCH_CONSOLE
    system_process_args(argc, argv);
    g_extern.lifecycle_mode_state |= 1ULL << MODE_LOAD_GAME;
 #else
-   rarch_init_msg_queue();
-
-   int init_ret;
-   if ((init_ret = rarch_main_init(argc, argv))) return init_ret;
-
-   menu_init();
-
    g_extern.lifecycle_mode_state |= 1ULL << MODE_GAME;
+#endif
 
+#ifndef RARCH_CONSOLE
    // If we started a ROM directly from command line,
    // push it to ROM history.
    if (!g_extern.libretro_dummy)
@@ -295,11 +297,6 @@ int rarch_main(int argc, char *argv[])
    global_uninit_drivers();
 #endif
 #else
-   rarch_init_msg_queue();
-
-   int init_ret;
-   if ((init_ret = rarch_main_init(argc, argv))) return init_ret;
-
    while ((g_extern.is_paused && !g_extern.is_oneshot) ? rarch_main_idle_iterate() : rarch_main_iterate());
    rarch_main_deinit();
 #endif