diff --git a/PKHeX.WinForms/Subforms/SAV_Database.cs b/PKHeX.WinForms/Subforms/SAV_Database.cs
index 360255ad9..d7500a08d 100644
--- a/PKHeX.WinForms/Subforms/SAV_Database.cs
+++ b/PKHeX.WinForms/Subforms/SAV_Database.cs
@@ -263,6 +263,7 @@ public partial class SAV_Database : Form
 
         var versions = new List<ComboItem>(GameInfo.VersionDataSource);
         versions.Insert(0, comboAny);
+        versions.RemoveAt(versions.Count - 1); // None
         CB_GameOrigin.DataSource = versions;
 
         string[] hptypes = new string[GameInfo.Strings.types.Length - 2];
diff --git a/PKHeX.WinForms/Subforms/SAV_Encounters.cs b/PKHeX.WinForms/Subforms/SAV_Encounters.cs
index 4d6a77a90..85fe04598 100644
--- a/PKHeX.WinForms/Subforms/SAV_Encounters.cs
+++ b/PKHeX.WinForms/Subforms/SAV_Encounters.cs
@@ -201,7 +201,9 @@ public partial class SAV_Encounters : Form
         }
 
         var DS_Version = new List<ComboItem>(GameInfo.VersionDataSource);
-        DS_Version.Insert(0, Any); CB_GameOrigin.DataSource = DS_Version;
+        DS_Version.Insert(0, Any);
+        DS_Version.RemoveAt(DS_Version.Count - 1);
+        CB_GameOrigin.DataSource = DS_Version;
 
         // Trigger a Reset
         ResetFilters(this, EventArgs.Empty);
diff --git a/PKHeX.WinForms/Subforms/SettingsEditor.cs b/PKHeX.WinForms/Subforms/SettingsEditor.cs
index 4b6cb38e6..3d2a55ddc 100644
--- a/PKHeX.WinForms/Subforms/SettingsEditor.cs
+++ b/PKHeX.WinForms/Subforms/SettingsEditor.cs
@@ -18,7 +18,7 @@ public partial class SettingsEditor : Form
 
         if (obj is PKHeXSettings s)
         {
-            var noSelectVersions = new[] {GameVersion.GO};
+            var noSelectVersions = new[] {GameVersion.GO, (GameVersion)0};
             CB_Blank.InitializeBinding();
             CB_Blank.DataSource = GameInfo.VersionDataSource.Where(z => !noSelectVersions.Contains((GameVersion)z.Value)).ToList();
             CB_Blank.SelectedValue = (int) s.Startup.DefaultSaveVersion;