diff --git a/templates/windows/installer.iss.in b/templates/windows/installer.iss.in
index 4623db7e..f4653b85 100644
--- a/templates/windows/installer.iss.in
+++ b/templates/windows/installer.iss.in
@@ -49,12 +49,18 @@ SetupIconFile="@PROJECT_SOURCE_DIR@/media/icon.ico"
 SetupMutex=@PROJECT_NAME@-Setup,Global\@PROJECT_NAME@-Setup
 UninstallDisplayIcon={uninstallexe}
 
-; Other Information
+; Directory Choices
 UsePreviousAppDir=no
+DisableDirPage=no
+DirExistsWarning=no
+DefaultDirName={code:GetDefaultDirectory}
+AppendDefaultDirName=no
+DefaultGroupName={#MyAppName}
+AppendDefaultGroupName=yes
+
+; Other Information
 Uninstallable=yes
 CreateUninstallRegKey=not IsPortablePagePortableChoiceChecked()
-DefaultDirName={code:GetDefaultDirectory}
-DefaultGroupName={#MyAppName}
 AllowNoIcons=yes
 LicenseFile="@ISS_SOURCE_DIR@/LICENSE"
 OutputDir="@ISS_PACKAGE_DIR@"