diff --git a/src/wayland/handlers/xdg_shell/popup.rs b/src/wayland/handlers/xdg_shell/popup.rs
index 0e3ca699..d10dba8a 100644
--- a/src/wayland/handlers/xdg_shell/popup.rs
+++ b/src/wayland/handlers/xdg_shell/popup.rs
@@ -186,8 +186,7 @@ pub fn get_popup_toplevel(popup: &PopupSurface) -> Option<WlSurface> {
                 .parent
                 .as_ref()
                 .cloned()
-                .unwrap()
-        });
+        })?;
     }
     Some(parent)
 }