diff --git a/windows/OpenLP-base.wxs b/windows/OpenLP-base.wxs
index 7c43709..2c15a57 100644
--- a/windows/OpenLP-base.wxs
+++ b/windows/OpenLP-base.wxs
@@ -14,11 +14,9 @@
     <Package Id="*" Keywords="Installer" Description="$(var.Description)" Comments="$(var.Comments)"
       Manufacturer="$(var.Manufacturer)" InstallerVersion="400" Compressed="yes" Platform="$(var.Platform)"/>
     <Condition Message="You need to be an administrator to install this product.">Privileged</Condition>
-    <Media Id="1" Cabinet="OpenLP.cab" EmbedCab="yes"/>
+    <Media Id="1" Cabinet="OpenLP.cab" EmbedCab="yes" CompressionLevel="high"/>
     <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
     <Property Id="ARPPRODUCTICON" Value="OpenLP.ico" />
-    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch $(var.ProductName)" />
-    <CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" />
     <UIRef Id="WixUI_Common" />
     <UI Id="WixUI_OpenLP">
       <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
@@ -55,8 +53,11 @@
       <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
       <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
       <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
+      <Publish Dialog="ExitDialog" Control="Finish"  Event="DoAction" Value="LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
       <Property Id="ARPNOMODIFY" Value="1" />
     </UI>
+    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Start $(var.ProductName)" />
+    <CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" />
     <WixVariable Id="WixUIDialogBmp" Value="%(dialog)s" />
     <WixVariable Id="WixUIBannerBmp" Value="%(banner)s" />
     <Directory Id="TARGETDIR" Name="SourceDir">