diff --git a/src/layout.c b/src/layout.c
index 7c3786e..6e89614 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -629,7 +629,7 @@ mirror(int screen, Bool horizontal)
 void
 layer(int screen)
 {
-    Client *c;
+     Client *c;
      XRectangle geo = { 0 };
      XRectangle sg = sgeo[screen];
      int n, i, l = tags[screen][seltag[screen]].layers;
@@ -649,7 +649,10 @@ layer(int screen)
      }
 
      for(c = tiled_client(screen, clients); c; c = tiled_client(screen, c->next))
+     {
+          for(; c->layer > l; --(c->layer));
           ++nl[c->layer];
+     }
 
      for(i = 0, c = tiled_client(screen, clients); c; c = tiled_client(screen, c->next), ++i)
      {
@@ -657,8 +660,6 @@ layer(int screen)
           c->flags &= ~(MaxFlag | LMaxFlag);
           c->flags |= TileFlag;
 
-          for(; c->layer > l; --(c->layer));
-
           geo.x = x[c->layer];
           geo.height = (sg.height / l) - BORDH;
           geo.width = (sg.width / ((nl[c->layer]) ? nl[c->layer] : 1)) - BORDH * 2;