diff --git a/crates/bevy_window/src/lib.rs b/crates/bevy_window/src/lib.rs
index 03b270c693d44..b8df45eca2f6e 100644
--- a/crates/bevy_window/src/lib.rs
+++ b/crates/bevy_window/src/lib.rs
@@ -102,7 +102,8 @@ impl Plugin for WindowPlugin {
         }
 
         if self.close_when_requested {
-            app.add_system(close_when_requested.in_base_set(CoreSet::PostUpdate));
+            // Need to run before `exit_on_*` systems
+            app.add_system(close_when_requested);
         }
 
         // Register event types