diff --git a/screen-redraw.c b/screen-redraw.c
index 227ba648..a1fbfb18 100644
--- a/screen-redraw.c
+++ b/screen-redraw.c
@@ -1,4 +1,4 @@
-/* $Id: screen-redraw.c,v 1.25 2009-02-12 00:18:05 nicm Exp $ */
+/* $Id: screen-redraw.c,v 1.26 2009-02-21 17:52:25 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -38,7 +38,8 @@ screen_redraw_screen(struct client *c, struct screen *s)
 	/* Override the normal screen if one is given. */
 	if (s != NULL) {
 		for (i = 0; i < screen_size_y(s); i++)
-			screen_redraw_line(c, s, 0, i);
+			screen_redraw_line(c, s, 0, i);	
+		screen_redraw_status(c);
 		return;
 	}
 
diff --git a/server.c b/server.c
index f6a23eb7..c50f503d 100644
--- a/server.c
+++ b/server.c
@@ -1,4 +1,4 @@
-/* $Id: server.c,v 1.123 2009-02-16 19:29:17 nicm Exp $ */
+/* $Id: server.c,v 1.124 2009-02-21 17:52:25 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -506,6 +506,7 @@ server_check_redraw(struct client *c)
 			server_redraw_locked(c);
 		else
  			screen_redraw_screen(c, NULL);
+		c->flags &= ~CLIENT_STATUS;
 	}
 
 	if (c->flags & CLIENT_STATUS)