diff --git a/deluge/ui/gtkui/mainwindow.py b/deluge/ui/gtkui/mainwindow.py
index b4e6e2be6..bef19bb03 100644
--- a/deluge/ui/gtkui/mainwindow.py
+++ b/deluge/ui/gtkui/mainwindow.py
@@ -105,7 +105,6 @@ class MainWindow(component.Component):
                
     def quit(self):
         del self.config
-        self.hide()
         gtk.main_quit()
     
     def load_window_state(self):
diff --git a/deluge/ui/gtkui/menubar.py b/deluge/ui/gtkui/menubar.py
index fa56070d4..5dc72af4d 100644
--- a/deluge/ui/gtkui/menubar.py
+++ b/deluge/ui/gtkui/menubar.py
@@ -156,8 +156,8 @@ class MenuBar(component.Component):
     def on_menuitem_quitdaemon_activate(self, data=None):
         log.debug("on_menuitem_quitdaemon_activate")
         # Tell the core to shutdown
-        self.window.quit()
         client.shutdown()
+        self.window.quit()
         
     def on_menuitem_quit_activate(self, data=None):
         log.debug("on_menuitem_quit_activate")