diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index d13d12ff..e4ea90f9 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -1153,7 +1153,7 @@ resize_grab_motion(struct weston_pointer_grab *grab,
 
 	weston_pointer_move(pointer, event);
 
-	if (!shsurf)
+	if (!shsurf || !shsurf->desktop_surface)
 		return;
 
 	weston_view_from_global_fixed(shsurf->view,
@@ -1204,7 +1204,7 @@ resize_grab_button(struct weston_pointer_grab *grab,
 
 	if (pointer->button_count == 0 &&
 	    state == WL_POINTER_BUTTON_STATE_RELEASED) {
-		if (resize->base.shsurf != NULL) {
+		if (resize->base.shsurf && resize->base.shsurf->desktop_surface) {
 			struct weston_desktop_surface *desktop_surface =
 				resize->base.shsurf->desktop_surface;
 			weston_desktop_surface_set_resizing(desktop_surface,
@@ -1222,7 +1222,7 @@ resize_grab_cancel(struct weston_pointer_grab *grab)
 {
 	struct weston_resize_grab *resize = (struct weston_resize_grab *) grab;
 
-	if (resize->base.shsurf != NULL) {
+	if (resize->base.shsurf && resize->base.shsurf->desktop_surface) {
 		struct weston_desktop_surface *desktop_surface =
 			resize->base.shsurf->desktop_surface;
 		weston_desktop_surface_set_resizing(desktop_surface, false);