diff --git a/src/shell.c b/src/shell.c
index 85395c47e..8eb981939 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -231,7 +231,8 @@ shell_grab_init(struct shell_grab *grab,
 static void
 shell_grab_finish(struct shell_grab *grab)
 {
-	wl_list_remove(&grab->shsurf_destroy_listener.link);
+	if (grab->shsurf)
+		wl_list_remove(&grab->shsurf_destroy_listener.link);
 }
 
 static void