diff --git a/deluge/ui/gtkui/gtkui.py b/deluge/ui/gtkui/gtkui.py
index 12b861c58..20cfa05d5 100644
--- a/deluge/ui/gtkui/gtkui.py
+++ b/deluge/ui/gtkui/gtkui.py
@@ -101,8 +101,11 @@ class GtkUI:
         # Start the gtk main loop
         gtk.main()
 
+        log.debug("gtkui shutting down..")
         # Clean-up
         del self.mainwindow
         del self.signal_receiver
         del self.plugins
+        # Make sure the config file is closed and saved to disk.
+        deluge.configmanager.close("gtkui.conf")
         del deluge.configmanager
diff --git a/deluge/ui/gtkui/mainwindow.py b/deluge/ui/gtkui/mainwindow.py
index 54f18c966..47913791d 100644
--- a/deluge/ui/gtkui/mainwindow.py
+++ b/deluge/ui/gtkui/mainwindow.py
@@ -92,6 +92,12 @@ class MainWindow:
         self.window.hide()
         
     def quit(self):
+        del self.menubar
+        del self.toolbar
+        del self.torrentview
+        del self.torrentdetails
+        del self.preferences
+        del self.config
         self.hide()
         gtk.main_quit()
     
diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py
index 1625b8b49..fafd81a3a 100644
--- a/deluge/ui/gtkui/preferences.py
+++ b/deluge/ui/gtkui/preferences.py
@@ -78,6 +78,9 @@ class Preferences:
             "on_toggle": self.on_toggle
         })
     
+    def __del__(self):
+        del self.gtkui_config
+        
     def add_page(self, name, widget):
         """Add a another page to the notebook"""
         index = self.notebook.append_page(widget)
diff --git a/deluge/ui/gtkui/signals.py b/deluge/ui/gtkui/signals.py
index 10970775a..ddcc0d551 100644
--- a/deluge/ui/gtkui/signals.py
+++ b/deluge/ui/gtkui/signals.py
@@ -32,7 +32,6 @@
 #    statement from all source files in the program, then also delete it here.
 
 import deluge.ui.functions as functions
-from deluge.config import Config
 from deluge.log import LOG as log
 
 class Signals: