diff --git a/CSharp/Engines/WindowsForms/Plugins/UniversalEditor.Plugins.Microsoft.SoftwareInstallation.UserInterface.WindowsForms/Dialogs/Setup/Microsoft/ACME/BootstrapScript/ManageOperatingSystemsDialog.cs b/CSharp/Engines/WindowsForms/Plugins/UniversalEditor.Plugins.Microsoft.SoftwareInstallation.UserInterface.WindowsForms/Dialogs/Setup/Microsoft/ACME/BootstrapScript/ManageOperatingSystemsDialog.cs
index fe1ef2dc..7b6fdb13 100644
--- a/CSharp/Engines/WindowsForms/Plugins/UniversalEditor.Plugins.Microsoft.SoftwareInstallation.UserInterface.WindowsForms/Dialogs/Setup/Microsoft/ACME/BootstrapScript/ManageOperatingSystemsDialog.cs
+++ b/CSharp/Engines/WindowsForms/Plugins/UniversalEditor.Plugins.Microsoft.SoftwareInstallation.UserInterface.WindowsForms/Dialogs/Setup/Microsoft/ACME/BootstrapScript/ManageOperatingSystemsDialog.cs
@@ -50,6 +50,8 @@ namespace UniversalEditor.Dialogs.Setup.Microsoft.ACME.BootstrapScript
 				lvi.Tag = item;
 				lv.Items.Add(lvi);
 			}
+
+			RefreshButtons();
 		}
 
 		private void cmdAdd_Click(object sender, EventArgs e)
@@ -109,6 +111,19 @@ namespace UniversalEditor.Dialogs.Setup.Microsoft.ACME.BootstrapScript
 			}
 
 			lv.Items.Clear();
+
+			mvarOperatingSystems.Clear();
+			mvarOperatingSystems.Add(BootstrapOperatingSystem.PlatformIndependent);
+
+			foreach (BootstrapOperatingSystem item in mvarOperatingSystems)
+			{
+				ListViewItem lvi = new ListViewItem();
+				lvi.Checked = item.Enabled;
+				lvi.Text = item.Name;
+				lvi.Tag = item;
+				lv.Items.Add(lvi);
+			}
+
 			RefreshButtons();
 		}