diff --git a/build/xchat-wdk.iss b/build/xchat-wdk.iss
index 74dbd54a..d50b3b14 100644
--- a/build/xchat-wdk.iss
+++ b/build/xchat-wdk.iss
@@ -21,10 +21,11 @@ PrivilegesRequired=lowest
 CreateUninstallRegKey=no
 Uninstallable=no
 ArchitecturesAllowed=x86 x64
+ArchitecturesInstallIn64BitMode=x64
 
 [Tasks]
-Name: x86; Description: "x86 version (for 32 bit editions of Windows)"; Flags: unchecked exclusive
-Name: x64; Description: "x64 version (for 64 bit editions of Windows)"; Flags: unchecked exclusive
+Name: x86; Description: "x86"; GroupDescription: "Please select which version of XChat-WDK you want to install:"; Flags: exclusive unchecked
+Name: x64; Description: "x64"; GroupDescription: "Please select which version of XChat-WDK you want to install:"; Flags: exclusive; Check: Is64BitInstallMode
 
 [Files]
 Source: "XChat-WDK r1459-2 x86.exe"; DestDir: "{tmp}"; Tasks: x86
@@ -34,5 +35,5 @@ Source: "XChat-WDK r1459-2 x64.exe"; DestDir: "{tmp}"; Tasks: x64
 BeveledLabel= XChat-WDK
 
 [Run]
-Filename: "{tmp}\XChat-WDK r1459-2 x86.exe"; Tasks: x86
-Filename: "{tmp}\XChat-WDK r1459-2 x64.exe"; Tasks: x64
+Filename: "{tmp}\XChat-WDK r1459-2 x86.exe"; Flags: nowait; Tasks: x86
+Filename: "{tmp}\XChat-WDK r1459-2 x64.exe"; Flags: nowait; Tasks: x64