diff --git a/toxygen/main.py b/toxygen/main.py
index cee02dc..d494a84 100644
--- a/toxygen/main.py
+++ b/toxygen/main.py
@@ -183,6 +183,7 @@ class Toxygen:
         self.tray.setObjectName('tray')
 
         self.ms = MainWindow(self.tox, self.reset, self.tray)
+        app.aboutToQuit.connect(self.ms.close_window)
 
         class Menu(QtGui.QMenu):
 
diff --git a/toxygen/mainscreen.py b/toxygen/mainscreen.py
index 672f181..b094651 100644
--- a/toxygen/mainscreen.py
+++ b/toxygen/mainscreen.py
@@ -341,6 +341,10 @@ class MainWindow(QtGui.QMainWindow, Singleton):
             event.ignore()
             self.hide()
 
+    def close_window(self):
+        Settings.get_instance().closing = True
+        self.close()
+
     def resizeEvent(self, *args, **kwargs):
         self.messages.setGeometry(0, 0, self.width() - 270, self.height() - 155)
         self.friends_list.setGeometry(0, 0, 270, self.height() - 125)