diff --git a/src/message_window.py b/src/message_window.py
index e6f5d04804ec6b36d48d4aa45726d7cec5d6ccc4..f6fd9af47e2bc841e2d6a7306bfb9a65826ac4be 100644
--- a/src/message_window.py
+++ b/src/message_window.py
@@ -198,8 +198,11 @@ def on_no(ctrl):
 			return
 
 		def on_minimize(ctrl):
-			self.on_delete_ok -= 1
 			ctrl.minimize()
+			if self.on_delete_ok == 1:
+				self.dont_warn_on_delete = True
+				win.destroy()
+			self.on_delete_ok -= 1
 
 		# Make sure all controls are okay with being deleted
 		ctrl_to_minimize = []