diff --git a/src/mumble/MainWindow.cpp b/src/mumble/MainWindow.cpp
index 78c10320f13..9ddb6353338 100644
--- a/src/mumble/MainWindow.cpp
+++ b/src/mumble/MainWindow.cpp
@@ -575,6 +575,7 @@ void MainWindow::openUrl(const QUrl &url) {
 	if (g.sh && g.sh->isRunning()) {
 		on_qaServerDisconnect_triggered();
 		g.sh->wait();
+		QCoreApplication::instance()->processEvents();
 	}
 
 	rtLast = MumbleProto::Reject_RejectType_None;
@@ -726,6 +727,7 @@ void MainWindow::on_qaServerConnect_triggered() {
 	if (g.sh && g.sh->isRunning() && res == QDialog::Accepted) {
 		on_qaServerDisconnect_triggered();
 		g.sh->wait();
+		QCoreApplication::instance()->processEvents();
 	}
 
 	if (res == QDialog::Accepted) {
diff --git a/src/mumble/ServerHandler.cpp b/src/mumble/ServerHandler.cpp
index 964ebd8df09..dfa4fbed91d 100644
--- a/src/mumble/ServerHandler.cpp
+++ b/src/mumble/ServerHandler.cpp
@@ -314,6 +314,7 @@ void ServerHandler::run() {
 	while (! cptr.unique()) {
 		msleep(100);
 	}
+	delete qtsSock;
 }
 
 void ServerHandler::setSslErrors(const QList<QSslError> &errors) {