diff --git a/window-choose.c b/window-choose.c
index 5de87572..8672212a 100644
--- a/window-choose.c
+++ b/window-choose.c
@@ -559,10 +559,10 @@ window_choose_key(struct window_pane *wp, unused struct client *c,
 			break;
 		if (item->state & TREE_EXPANDED) {
 			window_choose_collapse(wp, item->wcd->tree_session,
-			    item->wcd->idx);
+			    data->selected);
 		} else {
 			window_choose_expand(wp, item->wcd->tree_session,
-			    item->wcd->idx);
+			    data->selected);
 		}
 		window_choose_redraw_screen(wp);
 		break;