diff --git a/src/mumble/LookConfig.cpp b/src/mumble/LookConfig.cpp
index f7bf5acfd..d26af2bdc 100644
--- a/src/mumble/LookConfig.cpp
+++ b/src/mumble/LookConfig.cpp
@@ -143,7 +143,6 @@ void LookConfig::accept() const {
 			g.mw->qteLog->document()->setDefaultStyleSheet(sheet);
 		}
 	}
-	g.mw->setOnTop(s.bAlwaysOnTop);
 }
 
 bool LookConfig::expert(bool b) {
diff --git a/src/mumble/MainWindow.cpp b/src/mumble/MainWindow.cpp
index 50a02b29d..5b838ec89 100644
--- a/src/mumble/MainWindow.cpp
+++ b/src/mumble/MainWindow.cpp
@@ -1149,7 +1149,8 @@ void MainWindow::on_qaAudioUnlink_triggered() {
 
 void MainWindow::on_qaConfigDialog_triggered() {
 	ConfigDialog *dlg= new ConfigDialog(this);
-	dlg->exec();
+	if (dlg->exec() == QDialog::Accepted)
+		setOnTop(g.s.bAlwaysOnTop);
 	delete dlg;
 }