diff --git a/src/vulkan/wsi/wsi_common_win32.cpp b/src/vulkan/wsi/wsi_common_win32.cpp
index df41fd967c4..d246f56359a 100644
--- a/src/vulkan/wsi/wsi_common_win32.cpp
+++ b/src/vulkan/wsi/wsi_common_win32.cpp
@@ -636,6 +636,19 @@ wsi_win32_release_images(struct wsi_swapchain *drv_chain,
    return VK_SUCCESS;
 }
 
+static bool
+wsi_win32_find_idle_image(struct wsi_win32_swapchain *chain,
+                          uint32_t *out_image_index)
+{
+   for (uint32_t i = 0; i < chain->base.image_count; i++) {
+      if (chain->images[i].state == WSI_IMAGE_IDLE) {
+         *out_image_index = i;
+         chain->images[i].state = WSI_IMAGE_DRAWING;
+         return true;
+      }
+   }
+   return false;
+}
 
 static VkResult
 wsi_win32_acquire_next_image(struct wsi_swapchain *drv_chain,
@@ -649,13 +662,8 @@ wsi_win32_acquire_next_image(struct wsi_swapchain *drv_chain,
    if (chain->status != VK_SUCCESS)
       return chain->status;
 
-   for (uint32_t i = 0; i < chain->base.image_count; i++) {
-      if (chain->images[i].state == WSI_IMAGE_IDLE) {
-         *image_index = i;
-         chain->images[i].state = WSI_IMAGE_DRAWING;
-         return VK_SUCCESS;
-      }
-   }
+   if (wsi_win32_find_idle_image(chain, image_index))
+      return VK_SUCCESS;
 
    assert(chain->dxgi);
    uint32_t index = chain->dxgi->GetCurrentBackBufferIndex();