diff --git a/src/client.c b/src/client.c
index dff9f7c..1ad9640 100644
--- a/src/client.c
+++ b/src/client.c
@@ -888,7 +888,7 @@ client_manage(Window w, XWindowAttributes *wa, Bool ar)
      XSetWindowBorderWidth(dpy, c->win, 0);
      mouse_grabbuttons(c, False);
 
-     /* Transient */
+     /* Transient for tag setting */
      if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
           for(t = clients; t && t->win != trans; t = t->next);
 
@@ -897,46 +897,41 @@ client_manage(Window w, XWindowAttributes *wa, Bool ar)
           c->tag = t->tag;
           c->screen = t->screen;
      }
-
      if(!(c->flags & FreeFlag)
           && (rettrans == Success || (c->flags & HintFlag)))
                c->flags |= FreeFlag;
-
      free(t);
 
+     /* Handle client from here */
      client_attach(c);
      client_set_rules(c);
+     client_get_name(c);
 
      tags[c->screen][c->tag].cleanfact = True;
 
-     client_get_name(c);
+     /* Case of split layout */
+     split_client_integrate(c, sel);
+
+     /* If client will be visible soon so.. */
      if(c->tag == (uint)seltag[selscreen])
      {
-          client_raise(c);
           setwinstate(c->win, NormalState);
+          client_raise(c);
+          client_map(c);
+          client_focus(c);
      }
      else
           client_hide(c);
 
-     ewmh_get_client_list();
-     client_update_attributes(c);
-
-     if(c->tag == (uint)seltag[selscreen])
-          client_map(c);
-
      ewmh_manage_window_type(c);
 
+     /* Need arrange for dynamic layouts */
      if(ar)
           arrange(c->screen, True);
 
-     split_client_integrate(c, sel);
-
      if(!conf.client.set_new_win_master)
           layout_set_client_master(c);
 
-     if(c->tag == (uint)seltag[selscreen])
-          client_focus(c);
-
      if(conf.client.new_client_get_mouse)
      {
           /* Move pointer on client */
@@ -946,7 +941,6 @@ client_manage(Window w, XWindowAttributes *wa, Bool ar)
                     c->geo.y + c->geo.height / 2);
      }
 
-
      return c;
 }
 
diff --git a/src/split.c b/src/split.c
index 04263a8..0c79cea 100644
--- a/src/split.c
+++ b/src/split.c
@@ -129,10 +129,10 @@ split_arrange_closed(Client ghost)
      return;
 }
 
-
 /** Split client hor or vert to insert another client in the new area
   *\param c Client pointer
   *\param p True = Vertical, False = Horizontal
+  *\return sgeo Geo of future integrated client
 */
 XRectangle
 split_client(Client *c, Bool p)