diff --git a/setup/installer/windows/wix-template.xml b/setup/installer/windows/wix-template.xml
index f4596ca12f..72ebcc78d0 100644
--- a/setup/installer/windows/wix-template.xml
+++ b/setup/installer/windows/wix-template.xml
@@ -127,12 +127,26 @@
                     Message="This application is only supported on {minverhuman}, or higher.">
                     <![CDATA[Installed OR (VersionNT >= {minver})]]>
                 </Condition>
+                <!-- On 64 bit installers there is a bug in WiX that causes the
+                     WixSetDefaultPerMachineFolder action to incorrectly set
+                     APPLICATIONFOLDER to the x86 value, so we override it. See
+                     http://stackoverflow.com/questions/5479790/wix-how-to-override-c-program-files-x86-on-x64-machine-in-wixui-advanced-s
+                     -->
+                <CustomAction
+                    Id="OverwriteWixSetDefaultPerMachineFolder"
+                    Property="WixPerMachineFolder"
+                    Value="[APPLICATIONFOLDER]"
+                    Execute="immediate"
+                    />
+
                 <InstallExecuteSequence>
                     <Custom Action="PreventDowngrading" After="FindRelatedProducts">NEWPRODUCTFOUND</Custom>
+                    {fix_wix}
                     <RemoveExistingProducts After="InstallFinalize" />
                 </InstallExecuteSequence>
                 <InstallUISequence>
                     <Custom Action="PreventDowngrading" After="FindRelatedProducts">NEWPRODUCTFOUND</Custom>
+                    {fix_wix}
                 </InstallUISequence>
 
                 <UI>
diff --git a/setup/installer/windows/wix.py b/setup/installer/windows/wix.py
index 4fe7ee4ef5..2665f635db 100644
--- a/setup/installer/windows/wix.py
+++ b/setup/installer/windows/wix.py
@@ -43,6 +43,7 @@ class WixMixIn:
             x64                = ' 64bit' if is64bit else '',
             minverhuman        = MINVERHUMAN,
             minver             = '600' if is64bit else '501',
+            fix_wix = '<Custom Action="OverwriteWixSetDefaultPerMachineFolder" After="WixSetDefaultPerMachineFolder" />' if is64bit else '',
             compression        = self.opts.msi_compression,
             app_components     = components,
             exe_map            = self.smap,