diff --git a/src/lib/Application.cpp b/src/lib/Application.cpp
index 71388c78..c4f3ac83 100644
--- a/src/lib/Application.cpp
+++ b/src/lib/Application.cpp
@@ -34,6 +34,7 @@
 
 std::shared_ptr<Application> Application::s_instance;
 std::string Application::s_uuid;
+bool Application::EULA_ACCEPT_REQUIRED = true;
 
 void Application::createInstance(
 	const Version& version, ViewFactory* viewFactory, NetworkFactory* networkFactory
@@ -449,7 +450,7 @@ void Application::loadWindow(bool showStartWindow)
 
 		updateTitle();
 
-		bool showEula = (appSettings->getAcceptedEulaVersion() < EULA_VERSION);
+		bool showEula = (EULA_ACCEPT_REQUIRED && appSettings->getAcceptedEulaVersion() < EULA_VERSION);
 		bool enterLicense = (state != LicenseChecker::LicenseState::VALID);
 
 		m_mainView->loadWindow(showStartWindow, showEula, enterLicense, licenseError);
diff --git a/src/lib/Application.h b/src/lib/Application.h
index 39a8a3a7..b78d246c 100644
--- a/src/lib/Application.h
+++ b/src/lib/Application.h
@@ -35,6 +35,7 @@ class Application
 {
 public:
 	static const int EULA_VERSION = 5;
+	static bool EULA_ACCEPT_REQUIRED;
 
 	static void createInstance(const Version& version, ViewFactory* viewFactory, NetworkFactory* networkFactory);
 	static std::shared_ptr<Application> getInstance();
diff --git a/src/lib_gui/platform_includes/includesWindows.h b/src/lib_gui/platform_includes/includesWindows.h
index 849be7e5..c1d380ca 100644
--- a/src/lib_gui/platform_includes/includesWindows.h
+++ b/src/lib_gui/platform_includes/includesWindows.h
@@ -9,6 +9,7 @@
 
 #include "FileSystem.h"
 #include "AppPath.h"
+#include "Application.h"
 #include "ResourcePaths.h"
 #include "UserPaths.h"
 #include "utility.h"
@@ -60,6 +61,8 @@ void setupApp(int argc, char *argv[])
 					userDataPath.concatenate(L"Sourcetrail/");
 				}
 				userDataPath.makeCanonical();
+				Application::EULA_ACCEPT_REQUIRED = false;
+
 			}
 			else
 			{
diff --git a/src/lib_gui/qt/window/QtMainWindow.cpp b/src/lib_gui/qt/window/QtMainWindow.cpp
index e6493135..8ca2f5d6 100644
--- a/src/lib_gui/qt/window/QtMainWindow.cpp
+++ b/src/lib_gui/qt/window/QtMainWindow.cpp
@@ -335,12 +335,10 @@ void QtMainWindow::loadWindow(bool showStartWindow, bool showEULA, bool enterLic
 		forceEnterLicense(licenseError);
 	}
 
-#ifndef Q_OS_WIN
 	if (showEULA)
 	{
 		showEula(true);
 	}
-#endif
 }
 
 void QtMainWindow::saveLayout()