diff --git a/src/Nazara/Platform/AppWindowingComponent.cpp b/src/Nazara/Platform/AppWindowingComponent.cpp
index 7e59b4614..80b898160 100644
--- a/src/Nazara/Platform/AppWindowingComponent.cpp
+++ b/src/Nazara/Platform/AppWindowingComponent.cpp
@@ -16,12 +16,13 @@ namespace Nz
 		{
 			Window& window = **it;
 			if (!window.IsOpen(true))
+			{
 				it = m_windows.erase(it);
+				if (m_quitOnLastWindowClosed && m_windows.empty())
+					GetApp().Quit();
+			}
 			else
 				++it;
 		}
-
-		if (m_quitOnLastWindowClosed && m_windows.empty())
-			GetApp().Quit();
 	}
 }