diff --git a/PKHeX.Core/PKM/PKM.cs b/PKHeX.Core/PKM/PKM.cs
index a4d4747ec..b119daef1 100644
--- a/PKHeX.Core/PKM/PKM.cs
+++ b/PKHeX.Core/PKM/PKM.cs
@@ -654,7 +654,7 @@ public virtual bool IsGenderValid()
 
             int gen = GenNumber;
             if (2 >= gen || gen >= 6)
-                return true;
+                return gender == (gender & 1);
 
             return gender == PKX.GetGenderFromPIDAndRatio(PID, gv);
         }
diff --git a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs
index 8609bf114..f57f84fda 100644
--- a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs	
+++ b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs	
@@ -509,7 +509,7 @@ private void ClickGender(object sender, EventArgs e)
             if (gt == 255 || gt == 0 || gt == 254) // Single gender/genderless
                 return;
 
-            int newGender = PKX.GetGenderFromString(Label_Gender.Text) ^ 1;
+            int newGender = (PKX.GetGenderFromString(Label_Gender.Text) & 1) ^ 1;
             if (pkm.Format <= 2)
             {
                 Stats.SetATKIVGender(newGender);