diff --git a/windows/build-installer.ps1 b/windows/build-installer.ps1
index 8218063e..26eb0749 100644
--- a/windows/build-installer.ps1
+++ b/windows/build-installer.ps1
@@ -149,9 +149,14 @@ Name: "{group}\{cm:UninstallProgram,{#Name}}"; Filename: "{uninstallexe}"
 Name: "{autodesktop}\{#Name}"; Filename: "{app}\{#ExeName}"; Tasks: desktopicon
 
 [Run]
-Filename: "{app}\{#ExeName}"; Description: "{cm:LaunchProgram,{#Name}}"; Flags: nowait postinstall
+Filename: "{app}\{#ExeName}"; Description: "{cm:LaunchProgram,{#Name}}"; Flags: nowait postinstall; Check: not IsNoRun
 
 [Code]
+function IsNoRun: Boolean;
+begin
+  Result := ExpandConstant('{param:NORUN|0}') = '1';
+end;
+
 function IsX64: Boolean;
 begin
   Result := not IsArm64;
@@ -219,9 +224,14 @@ Name: "{group}\{cm:UninstallProgram,{#Name}}"; Filename: "{uninstallexe}"
 Name: "{autodesktop}\{#Name}"; Filename: "{app}\{#ExeName}"; Tasks: desktopicon
 
 [Run]
-Filename: "{app}\{#ExeName}"; Description: "{cm:LaunchProgram,{#Name}}"; Flags: nowait postinstall
+Filename: "{app}\{#ExeName}"; Description: "{cm:LaunchProgram,{#Name}}"; Flags: nowait postinstall; Check: not IsNoRun
 
 [Code]
+function IsNoRun: Boolean;
+begin
+  Result := ExpandConstant('{param:NORUN|0}') = '1';
+end;
+
 procedure CurStepChanged(CurStep: TSetupStep);
 var
   MarkerPath: String;