diff --git a/sway/tree/view.c b/sway/tree/view.c
index ec54fed81..8cc94a059 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -931,6 +931,11 @@ void view_update_size(struct sway_view *view) {
 	con->pending.content_width = view->geometry.width;
 	con->pending.content_height = view->geometry.height;
 	container_set_geometry_from_content(con);
+
+	// Update the next scheduled width/height so correct coordinates
+	// are sent on the next toplevel configure from wlroots.
+	wlr_xdg_toplevel_set_size(view->wlr_xdg_toplevel, view->geometry.width,
+		view->geometry.height);
 }
 
 void view_center_surface(struct sway_view *view) {