diff --git a/include/libweston/libweston.h b/include/libweston/libweston.h
index 8dd32f3e..858bc50a 100644
--- a/include/libweston/libweston.h
+++ b/include/libweston/libweston.h
@@ -1476,6 +1476,7 @@ struct weston_view {
 	struct weston_surface *surface;
 	struct wl_list surface_link;
 	struct wl_signal destroy_signal;
+	struct wl_signal unmap_signal;
 
 	/* struct weston_paint_node::view_link */
 	struct wl_list paint_node_list;
@@ -1635,6 +1636,7 @@ struct weston_pointer_constraint {
 	bool hint_is_pending;
 
 	struct wl_listener pointer_destroy_listener;
+	struct wl_listener view_unmap_listener;
 	struct wl_listener surface_commit_listener;
 	struct wl_listener surface_activate_listener;
 };
diff --git a/libweston/compositor.c b/libweston/compositor.c
index f5c2e0c4..e0e71ac1 100644
--- a/libweston/compositor.c
+++ b/libweston/compositor.c
@@ -474,6 +474,7 @@ weston_view_create(struct weston_surface *surface)
 	wl_list_insert(&surface->views, &view->surface_link);
 
 	wl_signal_init(&view->destroy_signal);
+	wl_signal_init(&view->unmap_signal);
 	wl_list_init(&view->link);
 	wl_list_init(&view->layer_link.link);
 	wl_list_init(&view->paint_node_list);
@@ -2056,22 +2057,22 @@ weston_view_unmap(struct weston_view *view)
 	view->output_mask = 0;
 	weston_surface_assign_output(view->surface);
 
-	if (weston_surface_is_mapped(view->surface))
-		return;
+	if (!weston_surface_is_mapped(view->surface)) {
+		wl_list_for_each(seat, &view->surface->compositor->seat_list, link) {
+			struct weston_touch *touch = weston_seat_get_touch(seat);
+			struct weston_pointer *pointer = weston_seat_get_pointer(seat);
+			struct weston_keyboard *keyboard =
+				weston_seat_get_keyboard(seat);
 
-	wl_list_for_each(seat, &view->surface->compositor->seat_list, link) {
-		struct weston_touch *touch = weston_seat_get_touch(seat);
-		struct weston_pointer *pointer = weston_seat_get_pointer(seat);
-		struct weston_keyboard *keyboard =
-			weston_seat_get_keyboard(seat);
-
-		if (keyboard && keyboard->focus == view->surface)
-			weston_keyboard_set_focus(keyboard, NULL);
-		if (pointer && pointer->focus == view)
-			weston_pointer_clear_focus(pointer);
-		if (touch && touch->focus == view)
-			weston_touch_set_focus(touch, NULL);
+			if (keyboard && keyboard->focus == view->surface)
+				weston_keyboard_set_focus(keyboard, NULL);
+			if (pointer && pointer->focus == view)
+				weston_pointer_clear_focus(pointer);
+			if (touch && touch->focus == view)
+				weston_touch_set_focus(touch, NULL);
+		}
 	}
+	weston_signal_emit_mutable(&view->unmap_signal, view);
 }
 
 WL_EXPORT void
diff --git a/libweston/input.c b/libweston/input.c
index 0d172040..7ea90324 100644
--- a/libweston/input.c
+++ b/libweston/input.c
@@ -3675,6 +3675,8 @@ enable_pointer_constraint(struct weston_pointer_constraint *constraint,
 	constraint->view = view;
 	pointer_constraint_notify_activated(constraint);
 	weston_pointer_start_grab(constraint->pointer, &constraint->grab);
+	wl_signal_add(&constraint->view->unmap_signal,
+		      &constraint->view_unmap_listener);
 }
 
 static bool
@@ -3689,6 +3691,8 @@ weston_pointer_constraint_disable(struct weston_pointer_constraint *constraint)
 	constraint->view = NULL;
 	pointer_constraint_notify_deactivated(constraint);
 	weston_pointer_end_grab(constraint->grab.pointer);
+	wl_list_remove(&constraint->view_unmap_listener.link);
+	wl_list_init(&constraint->view_unmap_listener.link);
 }
 
 void
@@ -3891,6 +3895,16 @@ pointer_constraint_pointer_destroyed(struct wl_listener *listener, void *data)
 	weston_pointer_constraint_destroy(constraint);
 }
 
+static void
+pointer_constraint_view_unmapped(struct wl_listener *listener, void *data)
+{
+        struct weston_pointer_constraint *constraint =
+                container_of(listener, struct weston_pointer_constraint,
+                             view_unmap_listener);
+
+        disable_pointer_constraint(constraint);
+}
+
 static void
 pointer_constraint_surface_committed(struct wl_listener *listener, void *data)
 {
@@ -3955,6 +3969,8 @@ weston_pointer_constraint_create(struct weston_surface *surface,
 
 	constraint->surface_activate_listener.notify =
 		pointer_constraint_surface_activate;
+	constraint->view_unmap_listener.notify =
+		pointer_constraint_view_unmapped;
 	constraint->surface_commit_listener.notify =
 		pointer_constraint_surface_committed;
 	constraint->pointer_destroy_listener.notify =