diff --git a/src/lib/gui/MainWindow.cpp b/src/lib/gui/MainWindow.cpp
index 59f9d4411..742196cd3 100644
--- a/src/lib/gui/MainWindow.cpp
+++ b/src/lib/gui/MainWindow.cpp
@@ -1239,11 +1239,15 @@ void MainWindow::remoteHostChanged(const QString &newRemoteHost)
 
 void MainWindow::showClientError(deskflow::client::ErrorType error, const QString &address)
 {
+  if (!Settings::value(Settings::Gui::ShowGenericClientFailureDialog).toBool())
+    return;
+
   if (m_clientErrorVisible)
     return;
+
   m_clientErrorVisible = true;
-  deskflow::gui::messages::showClientConnectError(this, error, address);
   showAndActivate();
+  deskflow::gui::messages::showClientConnectError(this, error, address);
   m_clientErrorVisible = false;
 }
 
diff --git a/src/lib/gui/Messages.cpp b/src/lib/gui/Messages.cpp
index 7c913ea23..b7b5753c9 100644
--- a/src/lib/gui/Messages.cpp
+++ b/src/lib/gui/Messages.cpp
@@ -222,9 +222,6 @@ void showClientConnectError(QWidget *parent, deskflow::client::ErrorType error,
     return;
   }
 
-  if (!Settings::value(Settings::Gui::ShowGenericClientFailureDialog).toBool())
-    return;
-
   auto dialog = QMessageBox(parent);
   dialog.setWindowTitle(title);
   dialog.setText(message);