diff --git a/client.c b/client.c
index a063ea801..bd09b1398 100644
--- a/client.c
+++ b/client.c
@@ -312,8 +312,7 @@ client_manage(Window w, XWindowAttributes *wa, awesome_config *awesomeconf)
                         c->tags[i] = False;
 
                 if(!matched)
-                    for(i = 0; i < current_acf->ntags; i++)
-                        c->tags[i] = current_acf->tags[i].selected;
+                    tag_client_with_current_selected(c, current_acf);
                 break;
             }
         if(!has_rule)