diff --git a/src/client.c b/src/client.c
index 0c82cae..88be034 100644
--- a/src/client.c
+++ b/src/client.c
@@ -453,7 +453,8 @@ void
 _client_tab(struct client *c, struct client *cm)
 {
      /* Do not tab already tabed client */
-     if(c->flags & (CLIENT_TABBED | CLIENT_TABMASTER))
+     if(c->flags & (CLIENT_TABBED | CLIENT_TABMASTER)
+        || c->tag != cm->tag)
           return;
 
      layout_split_arrange_closed(c);
diff --git a/src/fifo.c b/src/fifo.c
index 26b3bfa..103b285 100644
--- a/src/fifo.c
+++ b/src/fifo.c
@@ -34,7 +34,7 @@ static void
 fifo_parse(char *cmd)
 {
      void (*func)(Uicb);
-     char *p = NULL, *arg = NULL;
+     char *p, *arg = NULL;
 
      /* remove trailing newline */
      if((p = strchr(cmd, '\n')))