1 files changed, 9 insertions, 4 deletions
diff --git a/src/nvim/window.c b/src/nvim/window.c
index b9714ce690..dccf3e2efc 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -3800,10 +3800,15 @@ void win_size_save(garray_T *gap)
 void win_size_restore(garray_T *gap)
 {
   if (win_count() * 2 == gap->ga_len) {
-    int i = 0;
-    FOR_ALL_WINDOWS(wp) {
-      frame_setwidth(wp->w_frame, ((int *)gap->ga_data)[i++]);
-      win_setheight_win(((int *)gap->ga_data)[i++], wp);
+    /* The order matters, because frames contain other frames, but it's
+     * difficult to get right. The easy way out is to do it twice. */
+    for (int j = 0; j < 2; ++j)
+    {
+      int i = 0;
+      FOR_ALL_WINDOWS(wp) {
+        frame_setwidth(wp->w_frame, ((int *)gap->ga_data)[i++]);
+        win_setheight_win(((int *)gap->ga_data)[i++], wp);
+      }
     }
     /* recompute the window positions */
     (void)win_comp_pos();