diff --git a/TODO b/TODO
index fcbba555..2e9561b3 100644
--- a/TODO
+++ b/TODO
@@ -82,9 +82,7 @@ option to pass through to xterm window when switching window
   should not emulate it doing so
 - activity/bell should be per-window not per-link? what if it is cur win in
   session not being watched?
-- document status-left/status-right/status-interval/set-titles
+- document status-left/status-right/status-interval/set-titles/command-prompt
 - enhance paste buffers. per-session buffers, lots of command love
-- stuff like rename would be nice to be able to do in-client like screen, if
-  it could be implemented in a non-icky way (we have control over the tty fd
-  now in the server so should be easier...)
+- command history for command-prompt
 - tidy up window modes
diff --git a/status.c b/status.c
index 59ca12b0..0445064e 100644
--- a/status.c
+++ b/status.c
@@ -1,4 +1,4 @@
-/* $Id: status.c,v 1.32 2008-06-19 19:40:35 nicm Exp $ */
+/* $Id: status.c,v 1.33 2008-06-19 20:48:48 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -323,7 +323,7 @@ status_prompt_redraw(struct client *c)
 		return;
 	offset = 0;
 
-	xx = strlen(c->prompt_string) + 1;
+	xx = strlen(c->prompt_string);
 	if (xx > c->sx)
 		xx = c->sx;
 	yy = c->sy - 1;		
@@ -332,7 +332,7 @@ status_prompt_redraw(struct client *c)
 	screen_redraw_set_attributes(&ctx, ATTR_REVERSE, 0x88);
 
 	screen_redraw_move_cursor(&ctx, 0, yy);
-	screen_redraw_write_string(&ctx, "%.*s ", (int) xx, c->prompt_string);
+	screen_redraw_write_string(&ctx, "%.*s", (int) xx, c->prompt_string);
 
 	left = c->sx - xx;
 	if (left != 0) {