diff --git a/window-tree.c b/window-tree.c
index 9b5269b7..79404dd9 100644
--- a/window-tree.c
+++ b/window-tree.c
@@ -38,8 +38,8 @@ static void		 window_tree_key(struct window_mode_entry *,
 
 #define WINDOW_TREE_DEFAULT_FORMAT \
 	"#{?pane_format," \
-		"#{?pane_marked,#[reverse],}" \
-		"#{pane_current_command}#{?pane_active,*,}#{?pane_marked,M,}" \
+		"#{?pane_marked,#[reverse],}#{?pane_floating_flag,#[italics],}" \
+		"#{pane_current_command}#{pane_flags}" \
 		"#{?#{&&:#{pane_title},#{!=:#{pane_title},#{host_short}}},: \"#{pane_title}\",}" \
 	",window_format," \
 		"#{?window_marked_flag,#[reverse],}" \