diff --git a/cmd-choose-tree.c b/cmd-choose-tree.c
index 1e6bba71..af85a3bf 100644
--- a/cmd-choose-tree.c
+++ b/cmd-choose-tree.c
@@ -203,8 +203,9 @@ windows_only:
 					cur_win = idx_ses;
 			}
 
-			xasprintf(&final_win_action, "%s ; %s",
-			    wcd ? wcd->command : "",  win_action);
+			xasprintf(&final_win_action, "%s %s %s",
+			    wcd != NULL ? wcd->command : "",
+			    wcd != NULL ? ";" : "", win_action);
 
 			if (win_ses != win_max)
 				cur_win_template = final_win_template_middle;