diff --git a/patch/warp.c b/patch/warp.c
index 0989de7..1cbf4b9 100644
--- a/patch/warp.c
+++ b/patch/warp.c
@@ -13,8 +13,11 @@ warp(const Client *c)
 	     y > c->y - c->bw &&
 	     x < c->x + c->w + c->bw*2 &&
 	     y < c->y + c->h + c->bw*2) ||
-	    (y > c->mon->by && y < c->mon->by + bh) ||
-	    (c->mon->topbar && !y))
+	    x < c->mon->wx ||
+	    x > c->mon->wx + c->mon->ww ||
+	    y < c->mon->wy ||
+	    y > c->mon->wy + c->mon->wh
+	)
 		return;
 
 	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w / 2, c->h / 2);