diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9075158e..3b7aac55 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -138,7 +138,7 @@ jobs:
             $wxsPath `
             -out $wixObj
           if ($LASTEXITCODE -ne 0) { throw "candle failed" }
-          & $light $wixObj -out $msiPath
+          & $light $wixObj -ext WixUIExtension -out $msiPath
           if ($LASTEXITCODE -ne 0) { throw "light failed" }
 
       - name: Sign MSI installer (Azure Trusted Signing)
diff --git a/packaging/windows/main.wxs b/packaging/windows/main.wxs
index b48d2ebd..9e4e417e 100644
--- a/packaging/windows/main.wxs
+++ b/packaging/windows/main.wxs
@@ -6,7 +6,7 @@
     candle.exe -arch x64 -dVersion=<x.y.z> -dSource=target\release\OpenCADStudio.exe \
                -dIcon=packaging\windows\AppIcon.ico packaging\windows\main.wxs \
                -out packaging\windows\main.wixobj
-    light.exe  packaging\windows\main.wixobj -out OpenCADStudio.msi
+    light.exe  packaging\windows\main.wixobj -ext WixUIExtension -out OpenCADStudio.msi
 
   Provides:
     * Per-machine install under Program Files\Open CAD Studio.
@@ -122,5 +122,35 @@
       <ComponentRef Id='ProgramMenuDirComp' />
     </Feature>
 
+    <!--
+      Finish-screen "Launch Open CAD Studio" checkbox.
+      WIXUI_EXITDIALOGOPTIONALCHECKBOX=1 pre-ticks the checkbox; the Publish
+      below fires the launch action when the user clicks Finish with it checked.
+      WixUI_Minimal shows a minimal wizard (Welcome → Progress → Finish).
+    -->
+    <Property Id='WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT' Value='Launch Open CAD Studio' />
+    <Property Id='WIXUI_EXITDIALOGOPTIONALCHECKBOX' Value='1' />
+
+    <!--
+      Start the installed exe after the wizard closes.
+      asyncNoWait lets the installer exit cleanly while the app starts.
+    -->
+    <CustomAction
+      Id='LaunchApplication'
+      FileKey='OpenCADStudioEXE'
+      ExeCommand=''
+      Execute='immediate'
+      Return='asyncNoWait'
+      Impersonate='yes' />
+
+    <UI>
+      <UIRef Id='WixUI_Minimal' />
+      <Publish
+        Dialog='ExitDialog'
+        Control='Finish'
+        Event='DoAction'
+        Value='LaunchApplication'>WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 AND NOT Installed</Publish>
+    </UI>
+
   </Product>
 </Wix>