diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
index 26511138..9eadf518 100644
--- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
@@ -1170,6 +1170,10 @@ void gameLobbyDialogImpl::leaveGame() {
     //stop autoStartTimerOverlay
     autoStartTimerOverlay->hide();
     autoStartTimer->stop();
+
+    //stop autoStartTimerOverlay
+    waitStartGameMsgBoxTimer->stop();
+    waitStartGameMsgBox->hide();
 }
 
 void gameLobbyDialogImpl::kickPlayer() {
@@ -1263,9 +1267,12 @@ void gameLobbyDialogImpl::showGameDescription(bool show) {
 }
 
 void gameLobbyDialogImpl::showWaitStartGameMsgBox() { 
-    waitStartGameMsgBox->show();
-    waitStartGameMsgBox->raise();
-    waitStartGameMsgBox->activateWindow();
+
+    if(this->isVisible()) {
+        waitStartGameMsgBox->show();
+        waitStartGameMsgBox->raise();
+        waitStartGameMsgBox->activateWindow();
+    }
 }
 
 void gameLobbyDialogImpl::joinAnyGameButtonRefresh() {