diff --git a/wintable/new/draw.h b/wintable/new/draw.h
index dc19788..409a1ad 100644
--- a/wintable/new/draw.h
+++ b/wintable/new/draw.h
@@ -100,6 +100,8 @@ static void draw(struct table *t, HDC dc, RECT cliprect, RECT client)
 			p.x += p.width;
 		}
 		p.y += p.height;
+		if (p.y >= client.bottom)			// >= because RECT.bottom is the first pixel outside the rect
+			break;
 	}
 
 	deselectFont(dc, prevfont, newfont);