diff --git a/.pick_status.json b/.pick_status.json
index 6e6d43344ca..87f7b156d60 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2668,7 +2668,7 @@
         "description": "vulkan/wsi: avoid deadlocking dri3 when polling deleted windows for events",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/vulkan/wsi/wsi_common_x11.c b/src/vulkan/wsi/wsi_common_x11.c
index a3c4538366f..0f851f6c25f 100644
--- a/src/vulkan/wsi/wsi_common_x11.c
+++ b/src/vulkan/wsi/wsi_common_x11.c
@@ -1029,6 +1029,10 @@ x11_get_wsi_image(struct wsi_swapchain *wsi_chain, uint32_t image_index)
    return &chain->images[image_index].base;
 }
 
+/* XXX this belongs in presentproto */
+#ifndef PresentWindowDestroyed
+#define PresentWindowDestroyed (1 << 0)
+#endif
 /**
  * Process an X11 Present event. Does not update chain->status.
  */
@@ -1039,6 +1043,8 @@ x11_handle_dri3_present_event(struct x11_swapchain *chain,
    switch (event->evtype) {
    case XCB_PRESENT_CONFIGURE_NOTIFY: {
       xcb_present_configure_notify_event_t *config = (void *) event;
+      if (config->pixmap_flags & PresentWindowDestroyed)
+         return VK_ERROR_SURFACE_LOST_KHR;
 
       if (config->width != chain->extent.width ||
           config->height != chain->extent.height)