diff --git a/ChangeLog b/ChangeLog
index 21f97af04..c96aaf21f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
 	* #1307: Fix not being able to add torrents
 	* #1293: Fix not being able to add paths that contain backslashes
 
+==== GtkUI ====
+	* Fix uncaught exception when closing deluge in classic mode
+
 ==== Execute ====
 	* #1306: Fix always executing last event
 
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"]