diff --git a/mboxd_windows.c b/mboxd_windows.c
index 451ecd1..1755c4a 100644
--- a/mboxd_windows.c
+++ b/mboxd_windows.c
@@ -417,7 +417,6 @@
 		context->current->age = 0;
 	}
 
-	context->current->size = context->windows.default_size;
 	context->current = NULL;
 	context->current_is_write = false;
 }
@@ -627,6 +626,7 @@
 		reset_window(context, cur);
 		return rc;
 	}
+	cur->size = rc;
 
 	/*
 	 * Since for V1 windows aren't constrained to start at multiples of