diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp
index 541afa57..3ca3414d 100755
--- a/src/gui/qt/gametable/gametableimpl.cpp
+++ b/src/gui/qt/gametable/gametableimpl.cpp
@@ -2935,6 +2935,7 @@ void gameTableImpl::closeGameTable() {
 
 	if (myServerGuiInterface.get() && myServerGuiInterface->getSession().isNetworkServerRunning()) {
 
+		qDebug() << "jo1";
 		QMessageBox msgBox(QMessageBox::Warning, tr("Closing PokerTH during network game"),
 	                   	tr("You are the hosting server. Do you want to close PokerTH anyway?"), QMessageBox::Yes | QMessageBox::No, this);
 
@@ -2947,6 +2948,7 @@ void gameTableImpl::closeGameTable() {
 		}
 	}
 	else {
+		qDebug() << "jo2";
 		mySession->terminateNetworkClient();
 		stopTimer();
 		myStartWindow->show();
diff --git a/src/gui/qt/startwindow/startwindowimpl.cpp b/src/gui/qt/startwindow/startwindowimpl.cpp
index 3fdfd07f..f1c69314 100644
--- a/src/gui/qt/startwindow/startwindowimpl.cpp
+++ b/src/gui/qt/startwindow/startwindowimpl.cpp
@@ -339,9 +339,7 @@ void startWindowImpl::joinGameLobby() {
 	if (myConnectToServerDialog->result() == QDialog::Rejected ) {
 		mySession->terminateNetworkClient();
 	}
-	else
-	{
-		this->hide();
+	else {
 		showLobbyDialog();
 	}
 }
@@ -477,6 +475,8 @@ void startWindowImpl::showClientDialog()
 	{
 		if (myGuiInterface->getMyW()->isVisible())
 			myGuiInterface->getMyW()->hide();
+		if (!this->isVisible())
+			this->show();
 		if (!myStartNetworkGameDialog->isVisible())
 			showNetworkStartDialog();
 	}
@@ -484,6 +484,8 @@ void startWindowImpl::showClientDialog()
 	{
 		if (myGuiInterface->getMyW()->isVisible())
 			myGuiInterface->getMyW()->hide();
+		if (!this->isVisible())
+			this->show();
 		if (!myGameLobbyDialog->isVisible())
 			showLobbyDialog();
 	}
@@ -495,6 +497,7 @@ void startWindowImpl::showLobbyDialog()
 
 	if (myGameLobbyDialog->result() == QDialog::Accepted)
 	{
+		this->hide();
 		//some gui modifications
 		myGuiInterface->getMyW()->networkGameModification();
 	}
@@ -510,6 +513,7 @@ void startWindowImpl::showNetworkStartDialog()
 
 	if (myStartNetworkGameDialog->result() == QDialog::Accepted ) {
 		
+		this->hide();
 		//some gui modifications
 		myGuiInterface->getMyW()->networkGameModification();
 	}