2 files changed, 3 insertions, 3 deletions
diff --git a/Swift/QtUI/QtChatTabs.cpp b/Swift/QtUI/QtChatTabs.cpp
index 53fa5ce..67cd8ae 100644
--- a/Swift/QtUI/QtChatTabs.cpp
+++ b/Swift/QtUI/QtChatTabs.cpp
@@ -31,7 +31,7 @@ void QtChatTabs::closeEvent(QCloseEvent* event) {
 	//Hide first to prevent flickering as each tab is removed.
 	hide();
 	for (int i = tabs_->count() - 1; i >= 0; i--) {
-		tabs_->removeTab(i);
+		tabs_->widget(i)->close();
 	}
 	event->accept();
 }
diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp
index fe97573..e627960 100644
--- a/Swift/QtUI/QtChatWindow.cpp
+++ b/Swift/QtUI/QtChatWindow.cpp
@@ -106,9 +106,9 @@ SecurityLabel QtChatWindow::getSelectedSecurityLabel() {
 }
 
 void QtChatWindow::closeEvent(QCloseEvent* event) {
-	onClosed();
-	emit windowClosing();
 	event->accept();
+	emit windowClosing();
+	onClosed();
 }
 
 void QtChatWindow::convertToMUC() {