diff --git a/src/tag.c b/src/tag.c
index 0db54ff..8f1f309 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -92,11 +92,12 @@ tag_client(struct tag *t, struct client *c)
 
      c->flags &= ~CLIENT_RULED;
 
-     infobar_elem_screen_update(c->screen, ElemTag);
-
      /* Client remove */
      if(!t)
+     {
+          infobar_elem_screen_update(c->screen, ElemTag);
           return;
+     }
 
      c->prevtag = c->tag;
      c->tag = t;
@@ -106,6 +107,8 @@ tag_client(struct tag *t, struct client *c)
 
      SLIST_INSERT_HEAD(&t->clients, c, tnext);
 
+     infobar_elem_screen_update(c->screen, ElemTag);
+
      if(c->flags & CLIENT_TABMASTER && c->prevtag)
      {
           struct client *cc;