diff --git a/contrib/msi/build-msi.sh b/contrib/msi/build-msi.sh
index 544f8010..27396459 100755
--- a/contrib/msi/build-msi.sh
+++ b/contrib/msi/build-msi.sh
@@ -233,17 +233,6 @@ cat > wix.xml << EOF
       <ComponentRef Id="ConfigScript" />
     </Feature>
 
-    <UI>
-      <Publish
-       Control="Finish"
-       Event="DoAction"
-       Value="LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
-    </UI>
-
-    <Property Id="WixShellExecTarget" Value="[#MeshUI]" />
-    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch Name" />
-    <CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" />
-
     <CustomAction
       Id="UpdateGenerateConfig"
       Directory="MeshInstallFolder"
@@ -252,6 +241,14 @@ cat > wix.xml << EOF
       Return="check"
       Impersonate="yes" />
 
+    <UI>
+      <Publish Dialog="ExitDialog" Control="Finish" Event="DoAction" Value="Return" Order="999">1</Publish>
+    </UI>
+
+    <Property Id="WixShellExecTarget" Value="[#MeshUI]" />
+    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch Name" />
+    <CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" />
+
     <InstallExecuteSequence>
       <Custom
         Action="UpdateGenerateConfig"