diff --git a/retroarch.c b/retroarch.c
index 415c66b403..eef7b07ba9 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2230,7 +2230,7 @@ bool rarch_main_command(unsigned cmd)
          g_extern.system.shutdown = false;
          break;
       case RARCH_CMD_QUIT:
-         g_extern.system.shutdown = true;
+         rarch_main_set_state(RARCH_ACTION_STATE_QUIT);
          break;
       case RARCH_CMD_REINIT:
          driver.video_cache_context =