diff --git a/deluge/ui/gtkui/mainwindow.py b/deluge/ui/gtkui/mainwindow.py
index 8f61c09c2..cc5cbb7f3 100644
--- a/deluge/ui/gtkui/mainwindow.py
+++ b/deluge/ui/gtkui/mainwindow.py
@@ -147,7 +147,7 @@ class MainWindow(component.Component):
             self.window.present()
             self.load_window_state()
 
-        if self.config["tray_password"] and not self.visible():
+        if self.config["lock_tray"] and not self.visible():
             dialog = PasswordDialog("Enter your pasword to open Deluge.")
             def on_dialog_response(response_id):
                 if response_id == gtk.RESPONSE_OK:
@@ -202,7 +202,7 @@ class MainWindow(component.Component):
                 d.addErrback(log_failure, "disconnect client")
             d.addBoth(stop_reactor)
 
-        if self.config["tray_password"] and not self.visible():
+        if self.config["lock_tray"] and not self.visible():
             dialog = PasswordDialog("Enter your pasword to Quit Deluge...")
             def on_dialog_response(response_id):
                 if response_id == gtk.RESPONSE_OK: