diff --git a/src/shell.c b/src/shell.c
index 5932020d..40cef14f 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -918,6 +918,9 @@ ping_handler(struct weston_surface *surface, uint32_t serial)
 	if (!shsurf->resource.client)
 		return;
 
+	if (shsurf->surface == shsurf->shell->grab_surface)
+		return;
+
 	if (!shsurf->ping_timer) {
 		shsurf->ping_timer = malloc(sizeof *shsurf->ping_timer);
 		if (!shsurf->ping_timer)