diff --git a/deluge/ui/gtkui/systemtray.py b/deluge/ui/gtkui/systemtray.py
index 6b1ca8593..4c0be9564 100644
--- a/deluge/ui/gtkui/systemtray.py
+++ b/deluge/ui/gtkui/systemtray.py
@@ -274,7 +274,7 @@ class SystemTray(component.Component):
         """Called when the tray icon is left clicked."""
         self.blink(False)
 
-        if self.window.active():
+        if self.window.active() or self.window.visible():
             self.window.hide()
         else:
             if self.config["lock_tray"]: