diff --git a/ChangeLog b/ChangeLog
index a4c09c072..33750c1e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,7 @@
 	* Fix uploading plugins when the daemon is not localhost
 	* Fix #692 no longer require tray password when quitting from the tray icon
 	  while the window is visible.
+	* Fix #782 do not ask for tray password when window is not minimized to tray
 
 ==== Console ====
 	* Fix using the console in Windows, but only in command-line mode
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"]: