diff --git a/dwm.c b/dwm.c
index f61ce3b..862ec24 100644
--- a/dwm.c
+++ b/dwm.c
@@ -1596,7 +1596,8 @@ tile(void) {
 				nh = th - 2 * c->border;
 		}
 		resize(c, nx, ny, nw, nh, True);
-		if((c->h < bh) || (c->h > nh)) /* client doesn't accept geometry */
+		if((c->h < bh) || (c->h > nh) || (c->w < bh) || (c->w > nw))
+			/* client doesn't accept geometry, so enforce it */
 			resize(c, nx, ny, nw, nh, False);
 		if(n > 1 && th != wah)
 			ny = c->y + c->h + 2 * c->border;