diff --git a/cmd-choose-window.c b/cmd-choose-window.c
index 9820c01e..9963fb5c 100644
--- a/cmd-choose-window.c
+++ b/cmd-choose-window.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-choose-window.c,v 1.7 2009-01-19 18:23:40 nicm Exp $ */
+/* $Id: cmd-choose-window.c,v 1.8 2009-04-30 16:27:29 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -76,8 +76,8 @@ cmd_choose_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 		idx++;
 
 		window_choose_add(wl->window->active,
-		    wm->idx, "%3d: %s [%ux%u] (%u panes)", wm->idx, w->name,
-		    w->sx, w->sy, window_count_panes(w));
+		    wm->idx, "%3d: %s [%ux%u %s] (%u panes)", wm->idx, w->name,
+		    w->sx, w->sy, layout_name(w), window_count_panes(w));
 	}
 
 	cdata = xmalloc(sizeof *cdata);
diff --git a/cmd-list-windows.c b/cmd-list-windows.c
index 9cfc255a..ad19117e 100644
--- a/cmd-list-windows.c
+++ b/cmd-list-windows.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-list-windows.c,v 1.33 2009-03-28 20:17:29 nicm Exp $ */
+/* $Id: cmd-list-windows.c,v 1.34 2009-04-30 16:27:29 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -78,8 +78,9 @@ cmd_list_windows_exec(struct cmd *self, struct cmd_ctx *ctx)
 			else
 				name = "unknown";		
 			ctx->print(ctx, 
-			    "     %s [%ux%u] [history %u/%u, %llu bytes]", 
-			    name, wp->sx, wp->sy, gd->hsize, gd->hlimit, size);
+			    "     %s [%ux%u %s] [history %u/%u, %llu bytes]", 
+			    name, wp->sx, wp->sy, layout_name(w), gd->hsize,
+			    gd->hlimit, size);
 		}
 	}
 
diff --git a/layout.c b/layout.c
index 64cf771c..ff5485eb 100644
--- a/layout.c
+++ b/layout.c
@@ -1,4 +1,4 @@
-/* $Id: layout.c,v 1.3 2009-04-01 21:10:08 nicm Exp $ */
+/* $Id: layout.c,v 1.4 2009-04-30 16:27:29 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -42,6 +42,12 @@ const struct {
 	{ "left-vertical", layout_left_vertical },
 }; 
 
+const char *
+layout_name(struct window *w)
+{
+	return (layouts[w->layout].name);
+}
+
 void
 layout_next(struct window *w)
 {
diff --git a/tmux.h b/tmux.h
index 689089c2..6890f01c 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1,4 +1,4 @@
-/* $Id: tmux.h,v 1.306 2009-04-30 06:01:24 nicm Exp $ */
+/* $Id: tmux.h,v 1.307 2009-04-30 16:27:29 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1543,6 +1543,7 @@ void		 window_pane_mouse(struct window_pane *,
     		     struct client *, u_char, u_char, u_char);
 
 /* layout.c */
+const char * 	 layout_name(struct window *);
 void		 layout_refresh(struct window *, int);
 void		 layout_next(struct window *);