diff --git a/include/vkcv/Window.hpp b/include/vkcv/Window.hpp
index ac024c3e2d451372cdec54472ef056e5af015e98..cef735632689cdd119b694674e9ac7af67471a3c 100644
--- a/include/vkcv/Window.hpp
+++ b/include/vkcv/Window.hpp
@@ -18,9 +18,9 @@ namespace vkcv {
 	private:
     	std::string m_title;
     	bool m_resizable;
+		bool m_shouldClose;
 		GLFWwindow *m_window;
 		SwapchainHandle m_swapchainHandle;
-		bool m_shouldClose;
 		event_handle<int, int> m_resizeHandle;
 
     public:
diff --git a/projects/indirect_dispatch/src/App.cpp b/projects/indirect_dispatch/src/App.cpp
index 70a2caec3202f1425a90efbb4d6fcf9024c314a5..83b8aa524d55ffe021a2f9dc3fd6ff02b1c04ee9 100644
--- a/projects/indirect_dispatch/src/App.cpp
+++ b/projects/indirect_dispatch/src/App.cpp
@@ -13,7 +13,7 @@ App::App() :
 		VK_MAKE_VERSION(0, 0, 1),
 		{ vk::QueueFlagBits::eGraphics ,vk::QueueFlagBits::eCompute , vk::QueueFlagBits::eTransfer },
 		{ VK_KHR_SWAPCHAIN_EXTENSION_NAME })),
-	m_windowHandle(m_core.createWindow(m_applicationName,m_windowWidth,m_windowHeight,false)),
+	m_windowHandle(m_core.createWindow(m_applicationName, m_windowWidth, m_windowHeight, false)),
 	m_cameraManager(m_core.getWindow(m_windowHandle)){}
 
 bool App::initialize() {
diff --git a/projects/particle_simulation/src/main.cpp b/projects/particle_simulation/src/main.cpp
index 2e2155c8ff10ebe4dc3ebcd549350ee6527e5b28..6cfd04d0badf723f5fbaa83fa014763d8593c802 100644
--- a/projects/particle_simulation/src/main.cpp
+++ b/projects/particle_simulation/src/main.cpp
@@ -22,7 +22,7 @@ int main(int argc, const char **argv) {
             {vk::QueueFlagBits::eTransfer, vk::QueueFlagBits::eGraphics, vk::QueueFlagBits::eCompute},
 			{ VK_KHR_SWAPCHAIN_EXTENSION_NAME }
     );
-	vkcv::WindowHandle windowHandle = core.createWindow(applicationName, windowWidth, windowHeight, false);
+	vkcv::WindowHandle windowHandle = core.createWindow(applicationName, windowWidth, windowHeight, true);
     vkcv::Window& window = core.getWindow(windowHandle);
 	vkcv::camera::CameraManager cameraManager(window);
 
diff --git a/projects/voxelization/src/main.cpp b/projects/voxelization/src/main.cpp
index 0fc3643cb0f8e326f12ea54c78751784ed42d279..d70fefca926530e1153de9f363557c6b501f49db 100644
--- a/projects/voxelization/src/main.cpp
+++ b/projects/voxelization/src/main.cpp
@@ -31,7 +31,7 @@ int main(int argc, const char** argv) {
 			{ vk::QueueFlagBits::eTransfer,vk::QueueFlagBits::eGraphics, vk::QueueFlagBits::eCompute },
 			features
 	);
-	vkcv::WindowHandle windowHandle = core.createWindow(applicationName, windowWidth, windowHeight, false);
+	vkcv::WindowHandle windowHandle = core.createWindow(applicationName, windowWidth, windowHeight, true);
 	vkcv::Window& window = core.getWindow(windowHandle);
 
 	bool     isFullscreen            = false;
diff --git a/src/vkcv/Window.cpp b/src/vkcv/Window.cpp
index 7d42304370207cfa145ae2206e4df32b7fc29698..2b49ea32b21dc5d2497f6844c17baf8c3454640e 100644
--- a/src/vkcv/Window.cpp
+++ b/src/vkcv/Window.cpp
@@ -101,6 +101,7 @@ namespace vkcv {
 	Window::Window() :
 	m_title(),
 	m_resizable(false),
+	m_shouldClose(false),
 	m_window(nullptr),
 	e_mouseButton(true),
 	e_mouseMove(true),
@@ -108,13 +109,13 @@ namespace vkcv {
 	e_resize(true),
 	e_key(true),
 	e_char(true),
-	e_gamepad(true),
-	m_shouldClose(false)
+	e_gamepad(true)
 	{}
 
 	Window::Window(const char* title, int width, int height, bool resizable) :
     m_title(title),
     m_resizable(resizable),
+	m_shouldClose(false),
     m_window(createGLFWWindow(title, width, height, resizable)),
 	e_mouseButton(true),
 	e_mouseMove(true),
@@ -122,8 +123,7 @@ namespace vkcv {
 	e_resize(true),
 	e_key(true),
 	e_char(true),
-	e_gamepad(true),
-	m_shouldClose(false)
+	e_gamepad(true)
     {
 		bindGLFWWindow(m_window, this);
     }