diff --git a/src/lime/app/Application.hx b/src/lime/app/Application.hx
index 0cdf4d3e7..b8a5b2bc3 100644
--- a/src/lime/app/Application.hx
+++ b/src/lime/app/Application.hx
@@ -549,12 +549,17 @@ class Application extends Module
 			__windowByID.remove(window.id);
 			window.close();
 
-			if (__windows.length == 0)
-			{
-				#if !lime_doc_gen
-				System.exit(0);
-				#end
-			}
+			__checkForAllWindowsClosed();
+		}
+	}
+
+	@:noCompletion private function __checkForAllWindowsClosed():Void
+	{
+		if (__windows.length == 0)
+		{
+			#if !lime_doc_gen
+			System.exit(0);
+			#end
 		}
 	}