diff --git a/src/wayland/handlers/xdg_shell/popup.rs b/src/wayland/handlers/xdg_shell/popup.rs
index e8fa88f3..608a3380 100644
--- a/src/wayland/handlers/xdg_shell/popup.rs
+++ b/src/wayland/handlers/xdg_shell/popup.rs
@@ -87,7 +87,7 @@ fn unconstrain_xdg_popup(
     if let Some(output_rect) = space
         .outputs_for_window(window)
         .into_iter()
-        .find(|o| o.geometry().contains(anchor_point))
+        .find(|o| space.output_geometry(o).map(|rect| rect.contains(anchor_point)).unwrap_or(false))
         .map(|o| space.output_geometry(&o).unwrap())
     {
         // the output_rect represented relative to the parents coordinate system