diff --git a/dwm.c b/dwm.c
index bd57193..a376707 100644
--- a/dwm.c
+++ b/dwm.c
@@ -1753,8 +1753,10 @@ void
 drawbar(Monitor *m)
 {
 	Bar *bar;
-	for (bar = m->bar; bar; bar = bar->next)
-		drawbarwin(bar);
+	
+	if (m->showbar)
+		for (bar = m->bar; bar; bar = bar->next)
+			drawbarwin(bar);
 }
 
 void
@@ -3948,6 +3950,10 @@ togglebar(const Arg *arg)
 	updatebarpos(selmon);
 	for (bar = selmon->bar; bar; bar = bar->next)
 		XMoveResizeWindow(dpy, bar->win, bar->bx, bar->by, bar->bw, bar->bh);
+	#if BAR_SYSTRAY_PATCH
+	if (!selmon->showbar && systray)
+		XMoveWindow(dpy, systray->win, -32000, -32000);
+	#endif // BAR_SYSTRAY_PATCH
 	arrange(selmon);
 }