diff --git a/client.c b/client.c
index af8345e01..84a41f2ff 100644
--- a/client.c
+++ b/client.c
@@ -280,7 +280,6 @@ client_manage(Window w, XWindowAttributes *wa, awesome_config *awesomeconf)
     c->phys_screen = awesomeconf->phys_screen;
     c->screen = get_screen_bycoord(c->display, c->x, c->y);
 
-    tag_client_with_current_selected(c, awesomeconf);
     move_client_to_screen(c, current_acf, True);
 
     /* update window title */
@@ -299,7 +298,6 @@ client_manage(Window w, XWindowAttributes *wa, awesome_config *awesomeconf)
                 if(r->screen != RULE_NOSCREEN && r->screen != c->screen)
                 {
                     current_acf = &awesomeconf[r->screen - awesomeconf->screen];
-                    tag_client_with_current_selected(c, current_acf);
                     move_client_to_screen(c, current_acf, True);
                 }
 
@@ -481,10 +479,7 @@ client_resize(Client *c, int x, int y, int w, int h, awesome_config *awesomeconf
         {
             int new_screen = get_screen_bycoord(c->display, c->x, c->y);
             if(c->screen != new_screen)
-            {
-                tag_client_with_current_selected(c, &awesomeconf[new_screen - awesomeconf->screen]);
                 move_client_to_screen(c, &awesomeconf[new_screen - awesomeconf->screen], False);
-            }
         }
     }
 }
diff --git a/event.c b/event.c
index a8cb576a8..6aa88a6ed 100644
--- a/event.c
+++ b/event.c
@@ -164,7 +164,6 @@ handle_event_configurerequest(XEvent * e, awesome_config *awesomeconf)
             if(old_screen != c->screen)
             {
                 move_client_to_screen(c, &awesomeconf[c->screen], False);
-                tag_client_with_current_selected(c, &awesomeconf[c->screen]);
                 drawstatusbar(&awesomeconf[old_screen]);
                 drawstatusbar(&awesomeconf[c->screen]);
             }
diff --git a/screen.c b/screen.c
index 6d003080b..336247579 100644
--- a/screen.c
+++ b/screen.c
@@ -163,6 +163,9 @@ move_client_to_screen(Client *c, awesome_config *acf_new, Bool doresize)
 {
     int old_screen = c->screen;
 
+    /* tag client with new screen tags */
+    tag_client_with_current_selected(c, acf_new);
+
     c->screen = acf_new->screen;
 
     if(doresize && old_screen != c->screen)
@@ -273,7 +276,6 @@ uicb_client_movetoscreen(awesome_config * awesomeconf,
         new_screen = get_screen_count(awesomeconf->display) - 1;
 
     prev_screen = sel->screen;
-    tag_client_with_current_selected(sel, &awesomeconf[new_screen - awesomeconf->screen]);
     move_client_to_screen(sel, &awesomeconf[new_screen - awesomeconf->screen], True);
     move_mouse_pointer_to_screen(awesomeconf->display, new_screen);
     arrange(&awesomeconf[prev_screen - awesomeconf->screen]);