diff --git a/gio/gapplication.c b/gio/gapplication.c
index 1fe12e966..c72ff5312 100644
--- a/gio/gapplication.c
+++ b/gio/gapplication.c
@@ -2324,8 +2324,9 @@ g_application_run (GApplication  *application,
 
   g_settings_sync ();
 
-  while (g_main_context_iteration (NULL, FALSE))
-    ;
+  if (!application->priv->must_quit_now)
+    while (g_main_context_iteration (NULL, FALSE))
+      ;
 
   return status;
 }