diff --git a/crates/eframe/src/native/run.rs b/crates/eframe/src/native/run.rs
index f443eae14..d7d8eac35 100644
--- a/crates/eframe/src/native/run.rs
+++ b/crates/eframe/src/native/run.rs
@@ -250,8 +250,11 @@ fn run_and_return(
                 if let Some(window) = winit_app.window(*window_id) {
                     window.request_redraw();
                     windows_next_repaint_times.remove(window_id);
+                    control_flow.set_poll();
+                } else {
+                    windows_next_repaint_times.remove(window_id);
+                    control_flow.set_wait();
                 }
-                control_flow.set_poll();
             } else {
                 next_repaint_time = Some(
                     next_repaint_time