diff --git a/fullscreen-shell/fullscreen-shell.c b/fullscreen-shell/fullscreen-shell.c
index 009ad1e3..7ee09d79 100644
--- a/fullscreen-shell/fullscreen-shell.c
+++ b/fullscreen-shell/fullscreen-shell.c
@@ -625,6 +625,7 @@ fs_output_apply_pending(struct fs_output *fsout)
 			return;
 		}
 		fsout->view->is_mapped = true;
+		fsout->surface->is_mapped = true;
 
 		wl_signal_add(&fsout->surface->destroy_signal,
 			      &fsout->surface_destroyed);