diff --git a/crates/eframe/src/native/run.rs b/crates/eframe/src/native/run.rs
index b932aef9c..3313aed13 100644
--- a/crates/eframe/src/native/run.rs
+++ b/crates/eframe/src/native/run.rs
@@ -1408,7 +1408,7 @@ mod glow_integration {
                             glutin.viewports.get(&viewport.read().pair.parent)
                         {
                             if let Some(window) = parent_viewport.read().window.as_ref() {
-                                return vec![EventResult::RepaintNow(window.read().id())];
+                                return vec![EventResult::RepaintNext(window.read().id())];
                             }
                         }
                         return vec![];
@@ -2341,7 +2341,7 @@ mod wgpu_integration {
                     if viewport_id != ViewportId::MAIN && render.is_none() {
                         if let Some(window) = running.viewports.read().get(&parent_id) {
                             if let Some(w) = window.window.as_ref() {
-                                return vec![EventResult::RepaintNow(w.read().id())];
+                                return vec![EventResult::RepaintNext(w.read().id())];
                             }
                         }
                         return vec![];
diff --git a/crates/egui/src/viewport.rs b/crates/egui/src/viewport.rs
index 7a81f90d8..941e56792 100644
--- a/crates/egui/src/viewport.rs
+++ b/crates/egui/src/viewport.rs
@@ -107,8 +107,8 @@ impl ViewportBuilder {
             fullsize_content_view: None,
             min_inner_size: None,
             max_inner_size: None,
-            drag_and_drop: None,
-            close_button: None,
+            drag_and_drop: Some(true),
+            close_button: Some(true),
             minimize_button: Some(true),
             maximize_button: Some(true),
             hittest: Some(true),