diff --git a/src/shell.c b/src/shell.c
index 2822a2b5..45bbed37 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -1085,7 +1085,9 @@ touch_move_grab_up(struct weston_touch_grab *grab, uint32_t time, int touch_id)
 	struct shell_touch_grab *shell_grab = container_of(grab, 
 							   struct shell_touch_grab,
 							   grab);
-	shell_touch_grab_end(shell_grab);
+
+	if (grab->touch->seat->num_tp == 0)
+		shell_touch_grab_end(shell_grab);
 }
 
 static void