diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index f70b310a..c962d269 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -4975,6 +4975,9 @@ shell_surface_output_destroyed(struct weston_surface *es)
 	struct shell_surface *shsurf = get_shell_surface(es);
 
 	shsurf->saved_position_valid = false;
+	shsurf->next_state.maximized = false;
+	shsurf->next_state.fullscreen = false;
+	shsurf->state_changed = true;
 }
 
 static void launch_desktop_shell_process(void *data);