diff --git a/common/include/window.h b/common/include/window.h
index 7c297c0ac..131ee02ee 100644
--- a/common/include/window.h
+++ b/common/include/window.h
@@ -129,7 +129,9 @@ public:
 	{
 		auto r = wind.w_callback(&wind, event, wind.w_data);
 		if (r == window_event_result::close)
-			window_close(&wind);
+			if (window_close(&wind))
+				return window_event_result::deleted;
+
 		return r;
 	}