diff --git a/deluge/ui/gtkui/menubar.py b/deluge/ui/gtkui/menubar.py
index e0962b513..e7e3d8c0e 100644
--- a/deluge/ui/gtkui/menubar.py
+++ b/deluge/ui/gtkui/menubar.py
@@ -112,35 +112,12 @@ class MenuBar:
     def on_menuitem_quitdaemon_activate(self, data=None):
         log.debug("on_menuitem_quitdaemon_activate")
         # Tell the core to shutdown
-        if self.window.visible():
-            self.window.hide()
-            self.window.quit()
-            functions.shutdown()
-        else:
-            from deluge.configmanager import ConfigManager
-            if self.config.get("lock_tray") == True:
-                from deluge.ui.gtk.systemtray import SystemTray
-                SystemTray.unlock_tray("quitdaemon")
-            else:
-                self.window.hide()
-                self.window.quit()
-                functions.shutdown()
+        self.window.quit()
+        functions.shutdown()
         
     def on_menuitem_quit_activate(self, data=None):
         log.debug("on_menuitem_quit_activate")
-        if self.window.visible():
-            self.window.hide()
-            self.window.quit()
-        else:
-            from deluge.configmanager import ConfigManager
-            self.config = ConfigManager("gtkui.conf")
-            if self.config.get("lock_tray") == True:
-                log.debug("trying to import")
-                from deluge.ui.gtk.systemtray import SystemTray
-                SystemTray.unlock_tray("quitui")
-            else:
-                self.window.hide()
-                self.window.quit()
+        self.window.quit()
     
     ## Edit Menu ##
     def on_menuitem_preferences_activate(self, data=None):