diff --git a/ChangeLog b/ChangeLog
index 4b546ecf8..4f48c9d88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,15 +8,18 @@
 	* #1247: Fix deluge-gtk from hanging on shutdown
 	* #995: Rewrote tracker_icons
 
-==== Blocklist ====
-	* Implement local blocklist support
-	* #861: Pause transfers until blocklist is imported
+==== GtkUI ====
+	* Fix uncaught exception when closing deluge in classic mode
 
-==== Web ====
+==== WebUI ====
 	* Migrate to ExtJS 3.1
 	* Add gzip compression of HTTP data to the server
 	* Improve the efficiency of the TorrentGrid
 
+==== Blocklist ====
+	* Implement local blocklist support
+	* #861: Pause transfers until blocklist is imported
+
 === Deluge 1.2.0 - "Bursting like an infected kidney" (10 January 2010) ===
 ==== Core ====
 	* Implement new RPC protocol DelugeRPC replacing XMLRPC
diff --git a/deluge/ui/gtkui/mainwindow.py b/deluge/ui/gtkui/mainwindow.py
index 1153b1e26..47887c155 100644
--- a/deluge/ui/gtkui/mainwindow.py
+++ b/deluge/ui/gtkui/mainwindow.py
@@ -153,7 +153,10 @@ class MainWindow(component.Component):
         return self.main_glade
 
     def quit(self):
-        reactor.stop()
+        if client.is_classicmode():
+            gtk.main_quit()
+        else:
+            reactor.stop()
 
     def load_window_state(self):
         x = self.config["window_x_pos"]