diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index b326d686..bec49e67 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -4092,12 +4092,21 @@ create_xdg_popup(struct shell_client *owner, void *shell,
uint32_t serial,
int32_t x, int32_t y)
{
- struct shell_surface *shsurf;
+ struct shell_surface *shsurf, *parent_shsurf;
/* Verify that we are creating the top most popup when mapping,
* as its not until then we know whether it was mapped as most
* top level or not. */
+ parent_shsurf = get_shell_surface(parent);
+ if (!shell_surface_is_xdg_popup(parent_shsurf) &&
+ !shell_surface_is_xdg_surface(parent_shsurf)) {
+ wl_resource_post_error(owner->resource,
+ XDG_POPUP_ERROR_INVALID_PARENT,
+ "xdg_popup parent was invalid");
+ return NULL;
+ }
+
shsurf = create_common_surface(owner, shell, surface, client);
if (!shsurf)
return NULL;
diff --git a/protocol/xdg-shell.xml b/protocol/xdg-shell.xml
index 82ff9175..fbf37231 100644
--- a/protocol/xdg-shell.xml
+++ b/protocol/xdg-shell.xml
@@ -403,6 +403,7 @@
These errors can be emitted in response to xdg_popup requests.
+