diff --git a/cmd-list-windows.c b/cmd-list-windows.c
index 5f4326a3..a816a017 100644
--- a/cmd-list-windows.c
+++ b/cmd-list-windows.c
@@ -84,7 +84,9 @@ cmd_list_windows_session(
 	if (template == NULL) {
 		switch (type) {
 		case 0:
-			template = DEFAULT_WINDOW_TEMPLATE;
+			template = DEFAULT_WINDOW_TEMPLATE \
+				" [layout #{window_layout}] #{window_id}" \
+				" #{?window_active, (active),}";
 			break;
 		case 1:
 			template = "#{session_name}:" DEFAULT_WINDOW_TEMPLATE;
diff --git a/tmux.h b/tmux.h
index 7f866bbf..d0dc1223 100644
--- a/tmux.h
+++ b/tmux.h
@@ -113,9 +113,7 @@ extern char   **environ;
 #define DEFAULT_WINDOW_TEMPLATE					\
 	"#{window_index}: #{window_name}#{window_flags} "	\
 	"(#{window_panes} panes) "				\
-	"[#{window_width}x#{window_height}] "			\
-	"[layout #{window_layout}] #{window_id}"		\
-	"#{?window_active, (active),}"
+	"[#{window_width}x#{window_height}]"
 #define DEFAULT_PANE_INFO_TEMPLATE				\
 	"#{session_name}:#{window_index}.#{pane_index}"