diff --git a/Weasel.Setup/SetupOptionDialog.cs b/Weasel.Setup/SetupOptionDialog.cs
index d977a9da6..d6932299d 100644
--- a/Weasel.Setup/SetupOptionDialog.cs
+++ b/Weasel.Setup/SetupOptionDialog.cs
@@ -23,6 +23,7 @@ private void InstallOptionDialog_Load(object sender, System.EventArgs e)
             defaultFolderRadio.Checked = string.IsNullOrEmpty(UserDir);
             customFolderRadio.Checked = !string.IsNullOrEmpty(UserDir);
             customPathBox.Enabled = !string.IsNullOrEmpty(UserDir);
+            selectButton.Enabled = !string.IsNullOrEmpty(UserDir);
             customPathBox.Text = UserDir;
 
             if (IsInstalled) {
@@ -37,6 +38,7 @@ private void DefaultFolderRadio_CheckedChanged(object sender, System.EventArgs e
             {
                 customPathBox.Text = string.Empty;
                 customPathBox.Enabled = false;
+                selectButton.Enabled= false;
             }
         }
 
@@ -45,6 +47,7 @@ private void CustomFolderRadio_CheckedChanged(object sender, System.EventArgs e)
             if (customFolderRadio.Checked)
             {
                 customPathBox.Enabled = true;
+                selectButton.Enabled = true;
             }
         }