diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index 0b686b92..53d804ca 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -2685,6 +2685,9 @@ set_maximized(struct shell_surface *shsurf, bool maximized)
 		weston_desktop_surface_get_surface(shsurf->desktop_surface);
 	int32_t width = 0, height = 0;
 
+	if (weston_desktop_surface_get_fullscreen(desktop_surface))
+		return;
+
 	if (maximized) {
 		struct weston_output *output;