diff --git a/app/gui/main.qml b/app/gui/main.qml
index e9a581b4..18fc3d7d 100644
--- a/app/gui/main.qml
+++ b/app/gui/main.qml
@@ -51,17 +51,19 @@ ApplicationWindow {
         }
 
         // Display any modal dialogs for configuration warnings
-        if (SystemProperties.isWow64) {
-            wow64Dialog.open()
-        }
+        if (runConfigChecks) {
+            if (SystemProperties.isWow64) {
+                wow64Dialog.open()
+            }
 
-        if (SystemProperties.unmappedGamepads) {
-            unmappedGamepadDialog.unmappedGamepads = SystemProperties.unmappedGamepads
-            unmappedGamepadDialog.open()
-        }
+            if (SystemProperties.unmappedGamepads) {
+                unmappedGamepadDialog.unmappedGamepads = SystemProperties.unmappedGamepads
+                unmappedGamepadDialog.open()
+            }
 
-        // Hardware acceleration is checked asynchronously
-        SystemProperties.hasHardwareAccelerationChanged.connect(hasHardwareAccelerationChanged)
+            // Hardware acceleration is checked asynchronously
+            SystemProperties.hasHardwareAccelerationChanged.connect(hasHardwareAccelerationChanged)
+        }
     }
 
     function hasHardwareAccelerationChanged() {
diff --git a/app/main.cpp b/app/main.cpp
index 35006bc8..0beaa422 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -926,6 +926,7 @@ int main(int argc, char *argv[])
 
     if (hasGUI) {
         engine.rootContext()->setContextProperty("initialView", initialView);
+        engine.rootContext()->setContextProperty("runConfigChecks", commandLineParserResult == GlobalCommandLineParser::NormalStartRequested);
 
         // Load the main.qml file
         engine.load(QUrl(QStringLiteral("qrc:/gui/main.qml")));