diff --git a/patch/systray.c b/patch/systray.c
index 107bcbc..0ca2f86 100644
--- a/patch/systray.c
+++ b/patch/systray.c
@@ -161,6 +161,8 @@ updatesystrayicongeom(Client *i, int w, int h)
 				i->w = (int) ((float)bh * ((float)i->w / (float)i->h));
 			i->h = bh;
 		}
+		if (i->w > 2*bh)
+			i->w = bh;
 	}
 }