diff --git a/client.c b/client.c
index f4c172f9..5437a2a2 100644
--- a/client.c
+++ b/client.c
@@ -339,7 +339,7 @@ client_manage(Window w, XWindowAttributes *wa, awesome_config *awesomeconf)
 
     /* move client to screen: this will set screen and create tags array */
     c->screen = get_screen_bycoord(c->display, c->x, c->y);
-    move_client_to_screen(c, awesomeconf, False);
+    move_client_to_screen(c, awesomeconf, True);
 
     /* check for transient and set tags like its parent */
     if((rettrans = XGetTransientForHint(c->display, w, &trans) == Success)
diff --git a/screen.c b/screen.c
index 60f8d578..c30a4a68 100644
--- a/screen.c
+++ b/screen.c
@@ -163,7 +163,7 @@ move_client_to_screen(Client *c, awesome_config *acf_new, Bool doresize)
     for(i = 0; i < acf_new->ntags; i++)
         c->tags[i] = acf_new->tags[i].selected;
 
-    if(doresize)
+    if(doresize && old_screen != c->screen)
     {
         ScreenInfo *si, *si_old;