diff --git a/syncplay/ui/gui.py b/syncplay/ui/gui.py
index 3bfd179..d3f9c72 100644
--- a/syncplay/ui/gui.py
+++ b/syncplay/ui/gui.py
@@ -82,7 +82,11 @@ class MainDialog(QtGui.QDialog):
                 "Are you sure you want to exit Syncplay?",
                 QtGui.QMessageBox.Yes | QtGui.QMessageBox.No)
         if reply == QtGui.QMessageBox.Yes:
-            sys.exit()
+            self._syncplayClient.stop()
+            
+    def closeEvent(self, event):
+        self.exitSyncplay()
+        event.ignore()
             
     def _extractSign(self, m):
         if(m):