diff --git a/src/layout.c b/src/layout.c
index 85e10d9..4b77a2e 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -232,9 +232,9 @@ tile(void)
 
                /* Remainder */
                if(i + 1 == (n < nmaster ? n : nmaster))
-                    cgeo.height = (sgeo.height - mastergeo.height * i);
+                    cgeo.height = (sgeo.height - mastergeo.height * i) + conf.ttbarheight;
 
-               cgeo.height -= border;
+               cgeo.height -= border + conf.ttbarheight;
           }
 
           /* Tiled Client */