diff --git a/installer/PowerToysSetup/Product.wxs b/installer/PowerToysSetup/Product.wxs
index d3fdde365e..1249d9e8dd 100644
--- a/installer/PowerToysSetup/Product.wxs
+++ b/installer/PowerToysSetup/Product.wxs
@@ -148,7 +148,7 @@
           Impersonate="yes"
           Return="asyncNoWait"
           FileKey="PowerToys.exe"
-          ExeCommand="" />
+          ExeCommand="--dont-elevate" />
 
         <CustomAction
           Id="TerminateProcesses"
diff --git a/src/runner/main.cpp b/src/runner/main.cpp
index 99b6560683..b673fd8fc4 100644
--- a/src/runner/main.cpp
+++ b/src/runner/main.cpp
@@ -386,7 +386,13 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
         apply_general_settings(general_settings, false);
         int rvalue = 0;
         const bool elevated = is_process_elevated();
-        if ((elevated ||
+
+        if (elevated && cmdLine.find("--dont-elevate") != std::string::npos &&
+            general_settings.GetNamedBoolean(L"run_elevated", false) == false) {
+            schedule_restart_as_non_elevated();
+            result = 0;
+        }
+        else if ((elevated ||
              general_settings.GetNamedBoolean(L"run_elevated", false) == false ||
              cmdLine.find("--dont-elevate") != std::string::npos))
         {