diff --git a/cmd-choose-tree.c b/cmd-choose-tree.c
index e592e7d9..dd6dd3b3 100644
--- a/cmd-choose-tree.c
+++ b/cmd-choose-tree.c
@@ -212,7 +212,8 @@ windows_only:
 
 			window_choose_add_window(wl->window->active,
 			    ctx, s2, wm, cur_win_template,
-			    final_win_action, idx_ses);
+			    final_win_action,
+			    (wflag && !sflag) ? win_ses : idx_ses);
 
 			free(final_win_action);
 		}