diff --git a/src/ifs/wl_surface/xdg_surface/xdg_popup.rs b/src/ifs/wl_surface/xdg_surface/xdg_popup.rs
index 1560242b..6f532121 100644
--- a/src/ifs/wl_surface/xdg_surface/xdg_popup.rs
+++ b/src/ifs/wl_surface/xdg_surface/xdg_popup.rs
@@ -317,7 +317,7 @@ impl Node for XdgPopup {
     }
 
     fn node_output(&self) -> Option<Rc<OutputNode>> {
-        self.xdg.workspace.get().map(|w| w.output.get())
+        Some(self.xdg.surface.output.get())
     }
 
     fn node_location(&self) -> Option<NodeLocation> {