diff --git a/src/frontend-common/vulkan_host_display.cpp b/src/frontend-common/vulkan_host_display.cpp
index f28a71ad4..84efeaffb 100644
--- a/src/frontend-common/vulkan_host_display.cpp
+++ b/src/frontend-common/vulkan_host_display.cpp
@@ -72,6 +72,8 @@ void* VulkanHostDisplay::GetRenderContext() const
 
 bool VulkanHostDisplay::ChangeRenderWindow(const WindowInfo& new_wi)
 {
+  g_vulkan_context->WaitForGPUIdle();
+
   if (new_wi.type == WindowInfo::Type::Surfaceless)
   {
     g_vulkan_context->ExecuteCommandBuffer(true);