diff --git a/src/view.c b/src/view.c
index f48169fa..54eb6039 100644
--- a/src/view.c
+++ b/src/view.c
@@ -1806,8 +1806,12 @@ update_last_layout_geometry(struct view *view)
 
 	if (view_is_floating(view)) {
 		view->last_layout_geometry = view->pending;
-	} else {
+	} else if (!wlr_box_empty(&view->natural_geometry)) {
 		view->last_layout_geometry = view->natural_geometry;
+	} else {
+		/* e.g. initially-maximized window */
+		view->last_layout_geometry =
+			view_get_fallback_natural_geometry(view);
 	}
 }