diff --git a/base/vulkanexamplebase.cpp b/base/vulkanexamplebase.cpp
index eadf4b38..8a386520 100644
--- a/base/vulkanexamplebase.cpp
+++ b/base/vulkanexamplebase.cpp
@@ -176,10 +176,10 @@ void VulkanExampleBase::createPipelineCache()
 
 void VulkanExampleBase::prepare()
 {
-	if (vulkanDevice->enableDebugMarkers)
-	{
+	if (vulkanDevice->enableDebugMarkers) {
 		vks::debugmarker::setup(device);
 	}
+	initSwapchain();
 	createCommandPool();
 	setupSwapChain();
 	createCommandBuffers();
diff --git a/base/vulkanexamplebase.h b/base/vulkanexamplebase.h
index 381a33cf..09950dd0 100644
--- a/base/vulkanexamplebase.h
+++ b/base/vulkanexamplebase.h
@@ -416,7 +416,6 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR, int)									\
 	vulkanExample = new VulkanExample();															\
 	vulkanExample->initVulkan();																	\
 	vulkanExample->setupWindow(hInstance, WndProc);													\
-	vulkanExample->initSwapchain();																	\
 	vulkanExample->prepare();																		\
 	vulkanExample->renderLoop();																	\
 	delete(vulkanExample);																			\
@@ -451,7 +450,6 @@ int main(const int argc, const char *argv[])													    \
 	for (size_t i = 0; i < argc; i++) { VulkanExample::args.push_back(argv[i]); };  				\
 	vulkanExample = new VulkanExample();															\
 	vulkanExample->initVulkan();																	\
-	vulkanExample->initSwapchain();																	\
 	vulkanExample->prepare();																		\
 	vulkanExample->renderLoop();																	\
 	delete(vulkanExample);																			\
@@ -466,7 +464,6 @@ int main(const int argc, const char *argv[])													    \
 	vulkanExample = new VulkanExample();															\
 	vulkanExample->initVulkan();																	\
 	vulkanExample->setupWindow();					 												\
-	vulkanExample->initSwapchain();																	\
 	vulkanExample->prepare();																		\
 	vulkanExample->renderLoop();																	\
 	delete(vulkanExample);																			\
@@ -488,7 +485,6 @@ int main(const int argc, const char *argv[])													    \
 	vulkanExample = new VulkanExample();															\
 	vulkanExample->initVulkan();																	\
 	vulkanExample->setupWindow();					 												\
-	vulkanExample->initSwapchain();																	\
 	vulkanExample->prepare();																		\
 	vulkanExample->renderLoop();																	\
 	delete(vulkanExample);																			\
diff --git a/triangle/triangle.cpp b/triangle/triangle.cpp
index b8c29279..095a472d 100644
--- a/triangle/triangle.cpp
+++ b/triangle/triangle.cpp
@@ -1115,7 +1115,6 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR pCmdLin
 	vulkanExample = new VulkanExample();
 	vulkanExample->initVulkan();
 	vulkanExample->setupWindow(hInstance, WndProc);
-	vulkanExample->initSwapchain();
 	vulkanExample->prepare();
 	vulkanExample->renderLoop();
 	delete(vulkanExample);
@@ -1150,7 +1149,6 @@ int main(const int argc, const char *argv[])
 	for (size_t i = 0; i < argc; i++) { VulkanExample::args.push_back(argv[i]); };
 	vulkanExample = new VulkanExample();
 	vulkanExample->initVulkan();
-	vulkanExample->initSwapchain();
 	vulkanExample->prepare();
 	vulkanExample->renderLoop();
 	delete(vulkanExample);
@@ -1164,7 +1162,6 @@ int main(const int argc, const char *argv[])
 	vulkanExample = new VulkanExample();
 	vulkanExample->initVulkan();
 	vulkanExample->setupWindow();
-	vulkanExample->initSwapchain();
 	vulkanExample->prepare();
 	vulkanExample->renderLoop();
 	delete(vulkanExample);
@@ -1187,7 +1184,6 @@ int main(const int argc, const char *argv[])
 	vulkanExample = new VulkanExample();
 	vulkanExample->initVulkan();
 	vulkanExample->setupWindow();
-	vulkanExample->initSwapchain();
 	vulkanExample->prepare();
 	vulkanExample->renderLoop();
 	delete(vulkanExample);