diff --git a/ILSpy.Installer/setup.cs b/ILSpy.Installer/setup.cs
index a4ce6c67b..598206abd 100644
--- a/ILSpy.Installer/setup.cs
+++ b/ILSpy.Installer/setup.cs
@@ -1,8 +1,10 @@
 using System;
 using System.IO;
 using System.Linq;
+using System.Text;
 
 using WixSharp;
+using WixSharp.Controls;
 
 namespace ILSpy.Installer
 {
@@ -33,6 +35,8 @@ namespace ILSpy.Installer
 			project.InstallScope = InstallScope.perUser;
 			project.InstallPrivileges = InstallPrivileges.limited;
 			project.ControlPanelInfo.ProductIcon = @"..\ILSpy\Images\ILSpy.ico";
+			project.LocalizationFile = Path.Combine(Environment.CurrentDirectory, "winui.wxl");
+			project.Encoding = Encoding.UTF8;
 
 			project.MajorUpgrade = new MajorUpgrade {
 				Schedule = UpgradeSchedule.afterInstallInitialize,
@@ -40,7 +44,13 @@ namespace ILSpy.Installer
 				DowngradeErrorMessage = "A newer release of ILSpy is already installed on this system. Please uninstall it first to continue."
 			};
 
-			project.UI = WUI.WixUI_ProgressOnly;
+			project.UI = WUI.WixUI_InstallDir;
+			project.CustomUI =
+				new DialogSequence()
+					.On(NativeDialogs.WelcomeDlg, Buttons.Next,
+						new ShowDialog(NativeDialogs.VerifyReadyDlg))
+					.On(NativeDialogs.VerifyReadyDlg, Buttons.Back,
+						new ShowDialog(NativeDialogs.WelcomeDlg));
 
 			project.ResolveWildCards().FindFile(f => f.Name.EndsWith("ILSpy.exe")).First()
 				.Shortcuts = new[] {
diff --git a/ILSpy.Installer/winui.wxl b/ILSpy.Installer/winui.wxl
new file mode 100644
index 000000000..b600ba1ea
--- /dev/null
+++ b/ILSpy.Installer/winui.wxl
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WixLocalization  Culture="en-US" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+	<String Id="VerifyReadyDlgInstallText" Overridable="yes">Click Install to begin the installation. Click Cancel to exit the wizard.
+		
+		
+		ILSpy will be installed for current user into following directory:
+		
+		    [INSTALLDIR]
+	</String>
+</WixLocalization>
\ No newline at end of file