diff --git a/dwm.c b/dwm.c
index e02fa02..49dc07b 100644
--- a/dwm.c
+++ b/dwm.c
@@ -838,9 +838,6 @@ buttonpress(XEvent *e)
 	#if BARPADDING_PATCH
 	padding -= sp * 2;
 	#endif // BARPADDING_PATCH
-	#if SYSTRAY_PATCH
-	padding -= getsystraywidth();
-	#endif // SYSTRAY_PATCH
 	#if TAGGRID_PATCH
 	columns = LENGTH(tags) / tagrows + ((LENGTH(tags) % tagrows > 0) ? 1 : 0);
 	#endif // TAGGRID_PATCH
@@ -855,6 +852,10 @@ buttonpress(XEvent *e)
 		selmon = m;
 		focus(NULL);
 	}
+	#if SYSTRAY_PATCH
+	if (showsystray && selmon == systraytomon(selmon))
+		padding -= getsystraywidth();
+	#endif // SYSTRAY_PATCH
 	if (ev->window == selmon->barwin) {
 		i = x = 0;
 		#if LEFTLAYOUT_PATCH
diff --git a/patch/systray.c b/patch/systray.c
index e3b0796..107bcbc 100644
--- a/patch/systray.c
+++ b/patch/systray.c
@@ -47,8 +47,8 @@ systraytomon(Monitor *m)
 			return selmon;
 		return m == selmon ? m : NULL;
 	}
-	for (n = 1, t = mons; t && t->next; n++, t = t->next) ;
-	for (i = 1, t = mons; t && t->next && i < systraypinning; i++, t = t->next) ;
+	for (n = 1, t = mons; t && t->next; n++, t = t->next);
+	for (i = 1, t = mons; t && t->next && i < systraypinning; i++, t = t->next);
 	if (systraypinningfailfirst && n < systraypinning)
 		return mons;
 	return t;