diff --git a/src/tag.c b/src/tag.c
index d389b29..9f175ca 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -182,13 +182,10 @@ uicb_tag_move_client_next(Uicb cmd)
      (void)cmd;
      struct tag *t;
 
-     /* Remove from current tag */
-     tag_client(NULL, W->client);
-
-     if((t = TAILQ_PREV(W->screen->seltag, tsub, next)))
+     if((t = TAILQ_NEXT(W->screen->seltag, next)))
           tag_client(t, W->client);
      else if( /* CIRCULAR OPTION */ 1)
-          tag_client(TAILQ_FIRST(&W->screen->tags, tsub), W->client);
+          tag_client(TAILQ_FIRST(&W->screen->tags), W->client);
 }
 
 void
@@ -197,9 +194,6 @@ uicb_tag_move_client_prev(Uicb cmd)
      (void)cmd;
      struct tag *t;
 
-     /* Remove from current tag */
-     tag_client(NULL, W->client);
-
      if((t = TAILQ_PREV(W->screen->seltag, tsub, next)))
           tag_client(t, W->client);
      else if( /* CIRCULAR OPTION */ 1)