diff --git a/src/shell.c b/src/shell.c
index 09ff86cf..bf5c704b 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -615,6 +615,7 @@ create_focus_surface(struct weston_compositor *ec,
 	surface->configure_private = fsurf;
 
 	fsurf->view = weston_view_create (surface);
+	fsurf->view->output = output;
 
 	weston_view_configure(fsurf->view, output->x, output->y,
 				 output->width, output->height);