diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index 2b9241c4..2f8e6106 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -1475,7 +1475,7 @@ surface_move(struct shell_surface *shsurf, struct weston_seat *seat)
 
 	if (shsurf->grabbed)
 		return 0;
-	if (shsurf->state.fullscreen)
+	if (shsurf->state.fullscreen || shsurf->state.maximized)
 		return 0;
 
 	move = malloc(sizeof *move);