--- a/client.c	Wed Jul 19 13:30:18 2006 +0200
+++ b/client.c	Wed Jul 19 13:36:04 2006 +0200
@@ -201,8 +201,6 @@
 	c->win = w;
 	c->bx = c->fx = c->tx = wa->x;
 	c->by = c->fy = c->ty = wa->y;
-	if(c->fy < bh)
-		c->by = c->fy = c->ty += bh;
 	c->bw = c->fw = c->tw = wa->width;
 	c->fh = c->th = wa->height;
 	c->bh = bh;
@@ -212,6 +210,9 @@
 	diff = sh - c->fh - bh;
 	c->fy = random() % (diff ? diff : 1);
 
+	if(c->fy < bh)
+		c->by = c->fy = c->ty = bh;
+
 	c->border = 1;
 	c->proto = getproto(c->win);
 	setsize(c);

--- a/tag.c	Wed Jul 19 13:30:18 2006 +0200
+++ b/tag.c	Wed Jul 19 13:36:04 2006 +0200
@@ -96,12 +96,18 @@
 				*c->w = mw - 2 * c->border;
 				*c->h = sh - 2 * c->border - bh;
 			}
-			else {
+			else if(h > bh) {
 				*c->x = sx + mw;
 				*c->y = sy + (i - 1) * h + bh;
 				*c->w = w - 2 * c->border;
 				*c->h = h - 2 * c->border;
 			}
+			else { /* fallback if h < bh */
+				*c->x = sx + mw;
+				*c->y = sy + bh;
+				*c->w = w - 2 * c->border;
+				*c->h = sh - 2 * c->border - bh;
+			}
 			resize(c, False, TopLeft);
 			i++;
 		}