diff --git a/src/client.c b/src/client.c
index 16838e7..6eb079d 100644
--- a/src/client.c
+++ b/src/client.c
@@ -360,7 +360,7 @@ client_manage(Window w, XWindowAttributes *wa)
      c = emalloc(1, sizeof(Client));
      c->win = w;
      c->screen = screen_get_sel();
-     c->ogeo.x = c->geo.x = wa->x;
+     c->ogeo.x = c->geo.x = wa->x + BORDH;
      c->ogeo.y = c->geo.y = wa->y + TBARH + INFOBARH;
      c->ogeo.width = c->geo.width = wa->width;
      c->ogeo.height = c->geo.height = wa->height;
diff --git a/src/wmfs.c b/src/wmfs.c
index 878b3d8..32a8738 100644
--- a/src/wmfs.c
+++ b/src/wmfs.c
@@ -123,7 +123,7 @@ void
 mainloop(void)
 {
      fd_set fd;
-     int len, r, offset = 0;
+     int len, r, offset = 0, i;
      char sbuf[sizeof statustext], *p;
      Bool readstdin = True;
      XEvent ev;
@@ -163,7 +163,8 @@ mainloop(void)
                     strncpy(statustext, sbuf, strlen(sbuf));
                     readstdin = False;
                }
-               infobar_draw(screen_get_sel());
+               for(i = 0; i < screen_count(); ++i)
+                    infobar_draw(i);
           }
           while(XPending(dpy))
           {