diff --git a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs
index 647dea0c2..5b4b839b3 100644
--- a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs	
+++ b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs	
@@ -1318,8 +1318,8 @@ private void UpdateOriginGame(object sender, EventArgs e)
                     width = 2 * width;
                 CB_MetLocation.DropDownWidth = width;
 
-                if (fieldsLoaded)
-                    ValidateChildren(); // prevent value resetting when finishing load routine
+                if (!fieldsLoaded)
+                    CB_GameOrigin.Focus(); // hacky validation forcing
             }
 
             // Visibility logic for Gen 4 encounter type; only show for Gen 4 Pokemon.