diff --git a/TODO b/TODO
index 64c62030..28e4b520 100644
--- a/TODO
+++ b/TODO
@@ -65,10 +65,12 @@
 	swap-panes
 	close-pane
 	move-pane (to window)
+	kill all but current
      should be able to move to a hidden pane and it would be moved into view
 - would be nice if tmux could be the shell
 - fix rxvt cursor fg issue (text under cursor has non-white fg)
 - key handling sucks a bit and needs to be reworked
+- window selection mode a la C-a " in screen
 
 for 0.6:
 - document OPTIONS section in man page with description of new option handling
diff --git a/client.c b/client.c
index 3e985b35..a4ba5601 100644
--- a/client.c
+++ b/client.c
@@ -1,4 +1,4 @@
-/* $Id: client.c,v 1.37 2009-01-11 00:48:42 nicm Exp $ */
+/* $Id: client.c,v 1.38 2009-01-15 00:21:24 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -82,7 +82,7 @@ retry:
 			if (server_start(path) != 0)
 				goto no_start;
 		}
-		goto fail;
+		goto retry;
 	}
 
 	if ((mode = fcntl(cctx->srv_fd, F_GETFL)) == -1)