diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index e0800408f..577a7d837 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -1378,10 +1378,9 @@ int MainWindow::raiseActivationDialog()
 void MainWindow::on_windowShown()
 {
 #ifndef SYNERGY_ENTERPRISE
-	if (!m_AppConfig->activationHasRun()){
-		if (!m_LicenseManager->serialKey().isValid()) {
+	if (!m_AppConfig->activationHasRun() &&
+		!m_LicenseManager->serialKey().isValid()){
 			raiseActivationDialog();
-		}
 	}
 #endif
 }