diff --git a/PKHeX.WinForms/Subforms/SAV_Encounters.cs b/PKHeX.WinForms/Subforms/SAV_Encounters.cs
index 46bf62364..8038febdb 100644
--- a/PKHeX.WinForms/Subforms/SAV_Encounters.cs
+++ b/PKHeX.WinForms/Subforms/SAV_Encounters.cs
@@ -154,11 +154,8 @@ namespace PKHeX.WinForms
                     return EncounterCriteria.Unrestricted;
             }
 
-            return new EncounterCriteria
-            {
-                Gender = editor.Gender,
-                Nature = (Nature) editor.Nature,
-            };
+            var set = new ShowdownSet(editor);
+            return EncounterCriteria.GetCriteria(set, editor.PersonalInfo);
         }
 
         private void PopulateComboBoxes()
diff --git a/Tests/PKHeX.Core.Tests/Simulator/GeneratorTests.cs b/Tests/PKHeX.Core.Tests/Simulator/GeneratorTests.cs
index 30fae88f5..d9c0dddd4 100644
--- a/Tests/PKHeX.Core.Tests/Simulator/GeneratorTests.cs
+++ b/Tests/PKHeX.Core.Tests/Simulator/GeneratorTests.cs
@@ -49,7 +49,7 @@ namespace PKHeX.Tests.Simulator
             var ez = EncounterMovesetGenerator.GenerateEncounters(pk, pk.Moves, GameVersion.W2).OfType<EncounterStatic>().First();
             ez.Should().NotBeNull("Shiny Haxorus stationary encounter exists for B2/W2");
 
-            var criteria = new EncounterCriteria();
+            var criteria = EncounterCriteria.Unrestricted;
             var tr = new SimpleTrainerInfo(GameVersion.B2)
             {
                 TID = 57600,