diff --git a/builders/windows-builder.py b/builders/windows-builder.py
index 0d1d78f..6b16960 100644
--- a/builders/windows-builder.py
+++ b/builders/windows-builder.py
@@ -174,9 +174,11 @@ class WindowsBuilder(Builder):
         self._print_verbose('Reading base WiX file')
         with open(os.path.join(config_dir, 'OpenLP-base.wxs'), 'rt') as base_file:
             xml = base_file.read()
+        progfilefolder = 'ProgramFiles64Folder' if self.arch == 'x64' else 'ProgramFilesFolder'
         xml = xml % dict(dialog=os.path.join(config_dir, 'WizardMain.bmp'),
                          banner=os.path.join(config_dir, 'WizardBanner.bmp'),
-                         platform=self.arch)
+                         platform=self.arch,
+                         progfilefolder=progfilefolder)
         tree = fromstring(xml.encode('utf8'))
         self._print_verbose('Creating XML fragments from files and directories')
         fragments = self._get_fragments_from_files(self.dist_path)
diff --git a/windows/OpenLP-base.wxs b/windows/OpenLP-base.wxs
index b612e82..15365a8 100644
--- a/windows/OpenLP-base.wxs
+++ b/windows/OpenLP-base.wxs
@@ -24,12 +24,8 @@
     <WixVariable Id="WixUIDialogBmp" Value="%(dialog)s" />
     <WixVariable Id="WixUIBannerBmp" Value="%(banner)s" />
     <Directory Id="TARGETDIR" Name="SourceDir">
-      <?if "%(platform)s"="x64"?>
-        <Directory Id="ProgramFiles64Folder">
-      <?else?>
-        <Directory Id="ProgramFilesFolder">
-      <?endif?>
-      <Directory Id="INSTALLDIR" Name="OpenLP"/>
+      <Directory Id="%(progfilefolder)s">
+        <Directory Id="INSTALLDIR" Name="OpenLP"/>
       </Directory>
       <Directory Id="ProgramMenuFolder" Name="Programs">
         <Directory Id="ProgramMenuDir" Name="OpenLP">