diff --git a/anvil/src/shell.rs b/anvil/src/shell.rs
index 81b85b5..e69b400 100644
--- a/anvil/src/shell.rs
+++ b/anvil/src/shell.rs
@@ -160,6 +160,11 @@ pub fn init_shell(
                 // TODO: touch move.
                 let pointer = seat.get_pointer().unwrap();
 
+                // Check that this surface has a click grab.
+                if !pointer.has_grab(serial) {
+                    return;
+                }
+
                 let start_data = pointer.grab_start_data().unwrap();
 
                 let toplevel = SurfaceKind::Xdg(surface);
@@ -210,6 +215,11 @@ pub fn init_shell(
                     // TODO: touch move.
                     let pointer = seat.get_pointer().unwrap();
 
+                    // Check that this surface has a click grab.
+                    if !pointer.has_grab(serial) {
+                        return;
+                    }
+
                     let start_data = pointer.grab_start_data().unwrap();
 
                     let toplevel = SurfaceKind::Wl(surface);