diff --git a/cmd-choose-tree.c b/cmd-choose-tree.c
index db0333e7..601d24f1 100644
--- a/cmd-choose-tree.c
+++ b/cmd-choose-tree.c
@@ -228,9 +228,12 @@ windows_only:
 	free(final_win_template_last);
 
 	window_choose_ready(wl->window->active, cur_win, NULL);
+	window_choose_collapse_all(wl->window->active);
 
-	if (args_has(args, 'u'))
+	if (args_has(args, 'u')) {
 		window_choose_expand_all(wl->window->active);
+		window_choose_set_current(wl->window->active, cur_win);
+	}
 
 	return (CMD_RETURN_NORMAL);
 }
diff --git a/tmux.h b/tmux.h
index 053b574e..8fb06223 100644
--- a/tmux.h
+++ b/tmux.h
@@ -2257,6 +2257,8 @@ struct window_choose_data	*window_choose_add_item(struct window_pane *,
 			struct client *, struct winlink *, const char *,
 			const char *, u_int);
 void	window_choose_expand_all(struct window_pane *);
+void	window_choose_collapse_all(struct window_pane *);
+void	window_choose_set_current(struct window_pane *, u_int);
 
 /* names.c */
 void		 queue_window_name(struct window *);
diff --git a/window-choose.c b/window-choose.c
index 792224c1..38773605 100644
--- a/window-choose.c
+++ b/window-choose.c
@@ -44,7 +44,6 @@ void	window_choose_scroll_down(struct window_pane *);
 
 void	window_choose_collapse(struct window_pane *, struct session *);
 void	window_choose_expand(struct window_pane *, struct session *, u_int);
-void	window_choose_collapse_all(struct window_pane *);
 
 enum window_choose_input_type {
 	WINDOW_CHOOSE_NORMAL = -1,
@@ -102,8 +101,7 @@ window_choose_add(struct window_pane *wp, struct window_choose_data *wcd)
 }
 
 void
-window_choose_ready(struct window_pane *wp, u_int cur,
-    void (*callbackfn)(struct window_choose_data *))
+window_choose_set_current(struct window_pane *wp, u_int cur)
 {
 	struct window_choose_mode_data	*data = wp->modedata;
 	struct screen			*s = &data->screen;
@@ -112,12 +110,22 @@ window_choose_ready(struct window_pane *wp, u_int cur,
 	if (data->selected > screen_size_y(s) - 1)
 		data->top = ARRAY_LENGTH(&data->list) - screen_size_y(s);
 
+	window_choose_redraw_screen(wp);
+}
+
+void
+window_choose_ready(struct window_pane *wp, u_int cur,
+    void (*callbackfn)(struct window_choose_data *))
+{
+	struct window_choose_mode_data	*data = wp->modedata;
+
 	data->callbackfn = callbackfn;
 	if (data->callbackfn == NULL)
 		data->callbackfn = window_choose_default_callback;
 
 	ARRAY_CONCAT(&data->old_list, &data->list);
 
+	window_choose_set_current(wp, cur);
 	window_choose_collapse_all(wp);
 }