diff --git a/osx/boe.main.cpp b/osx/boe.main.cpp
index d5ee071d..93287710 100644
--- a/osx/boe.main.cpp
+++ b/osx/boe.main.cpp
@@ -296,6 +296,7 @@ void Handle_One_Event()
 			adjust_window_mode();
 		}
 		flushingInput = false;
+		redraw_screen(REFRESH_NONE);
 		mainPtr.display();
 		return;
 	}
diff --git a/osx/dialogxml/dialog.cpp b/osx/dialogxml/dialog.cpp
index 6a644e3b..4f13a8ac 100644
--- a/osx/dialogxml/dialog.cpp
+++ b/osx/dialogxml/dialog.cpp
@@ -931,20 +931,14 @@ void cDialog::run(){
 	// For whatever reason, delaying 100 milliseconds appears to fix this.
 	sf::sleep(sf::milliseconds(100));
 	win.create(sf::VideoMode(winRect.width(), winRect.height()), "Dialog", sf::Style::Titlebar);
-	win.setActive();
+	draw();
 	win.setVisible(true);
+	makeFrontWindow(parent ? parent-> win : mainPtr);
 	makeFrontWindow(win);
 	ModalSession dlog(win);
-	paintTimer.restart();
 	animTimer.restart();
-	draw();
 	while(dialogNotToast){
-		// TODO: This is just a hack to prevent the constant flickering.
-		// All it actually does is slow the flickering to non-blinding frequency.
-		if(paintTimer.getElapsedTime().asMilliseconds() > 500) {
-			draw();
-			paintTimer.restart();
-		}
+		draw();
 		dlog.pumpEvents();
 		if(!win.pollEvent(currentEvent)) continue;
 		location where;