diff --git a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs
index c8394ac89..3ca84ee1d 100644
--- a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs	
+++ b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs	
@@ -1957,16 +1957,19 @@ private static void SetIfDifferentCount(IReadOnlyCollection<ComboItem> update, C
         private void PopulateFilteredDataSources(ITrainerInfo sav, bool force = false)
         {
             var source = GameInfo.FilteredSources;
+            SetIfDifferentCount(source.Languages, CB_Language, force);
 
             if (sav.Generation >= 2)
             {
-                CheckMetLocationChange((GameVersion) sav.Game);
+                var game = (GameVersion) sav.Game;
+                if (game <= 0)
+                    game = GameUtil.GetVersion(sav.Generation);
+                CheckMetLocationChange(game);
                 SetIfDifferentCount(source.Items, CB_HeldItem, force);
             }
 
             if (sav.Generation >= 3)
             {
-                SetIfDifferentCount(source.Languages, CB_Language, force);
                 SetIfDifferentCount(source.Balls, CB_Ball, force);
                 SetIfDifferentCount(source.Games, CB_GameOrigin, force);
             }