diff --git a/frontend/menu/disp/rgui.c b/frontend/menu/disp/rgui.c
index 6eeb9335da..67234789cd 100644
--- a/frontend/menu/disp/rgui.c
+++ b/frontend/menu/disp/rgui.c
@@ -643,7 +643,7 @@ static void *rgui_init(void)
       RARCH_ERR("No font bitmap or binary, abort");
       /* TODO - should be refactored - perhaps don't do rarch_fail but instead
        * exit program */
-      g_extern.lifecycle_state &= ~((1ULL << MODE_MENU) | (1ULL << MODE_GAME));
+      rarch_main_command(RARCH_CMD_QUIT_RETROARCH);
       return NULL;
    }
 
@@ -666,7 +666,7 @@ static int rgui_input_postprocess(uint64_t old_state)
          g_extern.main_is_init &&
          !g_extern.libretro_dummy)
    {
-      g_extern.lifecycle_state |= (1ULL << MODE_GAME);
+      rarch_main_command(RARCH_CMD_RESUME);
       return -1;
    }
 
diff --git a/frontend/menu/disp/rmenu.c b/frontend/menu/disp/rmenu.c
index f46daab7ef..7ccc6b130a 100644
--- a/frontend/menu/disp/rmenu.c
+++ b/frontend/menu/disp/rmenu.c
@@ -508,7 +508,7 @@ static int rmenu_input_postprocess(uint64_t old_state)
          g_extern.main_is_init &&
          !g_extern.libretro_dummy)
    {
-      g_extern.lifecycle_state |= (1ULL << MODE_GAME);
+      rarch_main_command(RARCH_CMD_RESUME);
       return -1;
    }