diff --git a/cmd-resize-window.c b/cmd-resize-window.c
index d780b6ee..c5a7c5a1 100644
--- a/cmd-resize-window.c
+++ b/cmd-resize-window.c
@@ -98,9 +98,9 @@ cmd_resize_window_exec(struct cmd *self, struct cmdq_item *item)
 		sy += adjust;
 
 	if (args_has(args, 'A'))
-		default_window_size(s, w, &sx, &sy, WINDOW_SIZE_LARGEST);
+		default_window_size(NULL, s, w, &sx, &sy, WINDOW_SIZE_LARGEST);
 	else if (args_has(args, 'a'))
-		default_window_size(s, w, &sx, &sy, WINDOW_SIZE_SMALLEST);
+		default_window_size(NULL, s, w, &sx, &sy, WINDOW_SIZE_SMALLEST);
 
 	options_set_number(w->options, "window-size", WINDOW_SIZE_MANUAL);
 	resize_window(w, sx, sy);
diff --git a/resize.c b/resize.c
index b1a4b590..6432f003 100644
--- a/resize.c
+++ b/resize.c
@@ -76,30 +76,28 @@ ignore_client_size(struct client *c)
 }
 
 void
-default_window_size(struct session *s, struct window *w, u_int *sx, u_int *sy,
-    int type)
+default_window_size(struct client *c, struct session *s, struct window *w,
+    u_int *sx, u_int *sy, int type)
 {
-	struct client	*c;
+	struct client	*loop;
 	u_int		 cx, cy;
 	const char	*value;
 
 	if (type == -1)
 		type = options_get_number(global_w_options, "window-size");
-	if (type == WINDOW_SIZE_MANUAL)
-		goto manual;
-
-	if (type == WINDOW_SIZE_LARGEST) {
+	switch (type) {
+	case WINDOW_SIZE_LARGEST:
 		*sx = *sy = 0;
-		TAILQ_FOREACH(c, &clients, entry) {
-			if (ignore_client_size(c))
+		TAILQ_FOREACH(loop, &clients, entry) {
+			if (ignore_client_size(loop))
 				continue;
-			if (w != NULL && !session_has(c->session, w))
+			if (w != NULL && !session_has(loop->session, w))
 				continue;
-			if (w == NULL && c->session != s)
+			if (w == NULL && loop->session != s)
 				continue;
 
-			cx = c->tty.sx;
-			cy = c->tty.sy - status_line_size(c);
+			cx = loop->tty.sx;
+			cy = loop->tty.sy - status_line_size(loop);
 
 			if (cx > *sx)
 				*sx = cx;
@@ -108,18 +106,19 @@ default_window_size(struct session *s, struct window *w, u_int *sx, u_int *sy,
 		}
 		if (*sx == 0 || *sy == 0)
 			goto manual;
-	} else {
+		break;
+	case WINDOW_SIZE_SMALLEST:
 		*sx = *sy = UINT_MAX;
-		TAILQ_FOREACH(c, &clients, entry) {
-			if (ignore_client_size(c))
+		TAILQ_FOREACH(loop, &clients, entry) {
+			if (ignore_client_size(loop))
 				continue;
-			if (w != NULL && !session_has(c->session, w))
+			if (w != NULL && !session_has(loop->session, w))
 				continue;
-			if (w == NULL && c->session != s)
+			if (w == NULL && loop->session != s)
 				continue;
 
-			cx = c->tty.sx;
-			cy = c->tty.sy - status_line_size(c);
+			cx = loop->tty.sx;
+			cy = loop->tty.sy - status_line_size(loop);
 
 			if (cx < *sx)
 				*sx = cx;
@@ -128,6 +127,34 @@ default_window_size(struct session *s, struct window *w, u_int *sx, u_int *sy,
 		}
 		if (*sx == UINT_MAX || *sy == UINT_MAX)
 			goto manual;
+		break;
+	case WINDOW_SIZE_LATEST:
+		if (c != NULL && !ignore_client_size(c)) {
+			*sx = c->tty.sx;
+			*sy = c->tty.sy - status_line_size(c);
+		} else {
+			*sx = *sy = UINT_MAX;
+			TAILQ_FOREACH(loop, &clients, entry) {
+				if (ignore_client_size(loop))
+					continue;
+				if (w != NULL && loop != w->latest)
+					continue;
+				s = loop->session;
+
+				cx = loop->tty.sx;
+				cy = loop->tty.sy - status_line_size(loop);
+
+				if (cx < *sx)
+					*sx = cx;
+				if (cy < *sy)
+					*sy = cy;
+			}
+			if (*sx == UINT_MAX || *sy == UINT_MAX)
+				goto manual;
+		}
+		break;
+	case WINDOW_SIZE_MANUAL:
+		goto manual;
 	}
 	goto done;
 
diff --git a/spawn.c b/spawn.c
index e169b1e0..5a44df4d 100644
--- a/spawn.c
+++ b/spawn.c
@@ -153,7 +153,7 @@ spawn_window(struct spawn_context *sc, char **cause)
 			xasprintf(cause, "couldn't add window %d", idx);
 			return (NULL);
 		}
-		default_window_size(s, NULL, &sx, &sy, -1);
+		default_window_size(sc->c, s, NULL, &sx, &sy, -1);
 		if ((w = window_create(sx, sy)) == NULL) {
 			winlink_remove(&s->windows, sc->wl);
 			xasprintf(cause, "couldn't create window %d", idx);
diff --git a/tmux.h b/tmux.h
index e420a57a..b8bf8d8f 100644
--- a/tmux.h
+++ b/tmux.h
@@ -2198,8 +2198,8 @@ void	 status_prompt_save_history(void);
 
 /* resize.c */
 void	 resize_window(struct window *, u_int, u_int);
-void	 default_window_size(struct session *, struct window *, u_int *,
-	     u_int *, int);
+void	 default_window_size(struct client *, struct session *, struct window *,
+	     u_int *, u_int *, int);
 void	 recalculate_size(struct window *);
 void	 recalculate_sizes(void);