diff --git a/include/Nazara/Utility/Window.hpp b/include/Nazara/Utility/Window.hpp
index ba67c17cb5..b46efd6b9a 100644
--- a/include/Nazara/Utility/Window.hpp
+++ b/include/Nazara/Utility/Window.hpp
@@ -52,6 +52,7 @@ namespace Nz
 
 			void Destroy();
 
+			inline void EnableCloseOnQuit(bool closeOnQuit);
 			NAZARA_DEPRECATED("Event pooling/waiting is deprecated, please use the EventHandler system") inline void EnableEventPolling(bool enable);
 			void EnableKeyRepeat(bool enable);
 			void EnableSmoothScrolling(bool enable);
@@ -122,6 +123,7 @@ namespace Nz
 			#endif
 			EventHandler m_eventHandler;
 			bool m_closed;
+			bool m_closeOnQuit;
 			bool m_eventPolling;
 			bool m_ownsWindow;
 	};
diff --git a/include/Nazara/Utility/Window.inl b/include/Nazara/Utility/Window.inl
index 349328e55f..39c530e247 100644
--- a/include/Nazara/Utility/Window.inl
+++ b/include/Nazara/Utility/Window.inl
@@ -16,6 +16,7 @@ namespace Nz
 	#if NAZARA_UTILITY_THREADED_WINDOW
 	m_waitForEvent(false),
 	#endif
+	m_closeOnQuit(true),
 	m_eventPolling(false)
 	{
 	}
@@ -44,10 +45,11 @@ namespace Nz
 	m_eventCondition(std::move(window.m_eventCondition)),
 	m_eventMutex(std::move(window.m_eventMutex)),
 	m_eventConditionMutex(std::move(window.m_eventConditionMutex)),
-	m_eventPolling(window.m_eventPolling),
 	m_waitForEvent(window.m_waitForEvent),
 	#endif
 	m_closed(window.m_closed),
+	m_closeOnQuit(window.m_closeOnQuit),
+	m_eventPolling(window.m_eventPolling),
 	m_ownsWindow(window.m_ownsWindow)
 	{
 		window.m_impl = nullptr;
@@ -63,6 +65,11 @@ namespace Nz
 		m_closed = true; // The window will be closed at the next non-const IsOpen() call
 	}
 
+	inline void Window::EnableCloseOnQuit(bool closeOnQuit)
+	{
+		m_closeOnQuit = closeOnQuit;
+	}
+
 	inline void Window::EnableEventPolling(bool enable)
 	{
 		m_eventPolling = enable;
@@ -116,6 +123,9 @@ namespace Nz
 		if (event.type == WindowEventType_Resized)
 			OnWindowResized();
 
+		if (event.type == WindowEventType_Quit && m_closeOnQuit)
+			Close();
+
 		#if NAZARA_UTILITY_THREADED_WINDOW
 		m_eventMutex.Unlock();
 
@@ -137,6 +147,7 @@ namespace Nz
 		Destroy();
 
 		m_closed        = window.m_closed; 
+		m_closeOnQuit   = window.m_closeOnQuit;
 		m_eventPolling  = window.m_eventPolling;
 		m_impl          = window.m_impl;
 		m_events        = std::move(window.m_events);