diff --git a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs
index 1bf438b8c..25caff668 100644
--- a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs	
+++ b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs	
@@ -817,7 +817,6 @@ private void UpdateForm(object sender, EventArgs e)
             if (CB_Form == sender && FieldsLoaded)
                 pkm.AltForm = CB_Form.SelectedIndex;
 
-            UpdateGender();
             Stats.UpdateStats();
             // Repopulate Abilities if Species Form has different abilities
             SetAbilityList();
@@ -844,8 +843,13 @@ private void UpdateForm(object sender, EventArgs e)
             else if (PKX.GetGenderFromString(CB_Form.Text) < 2)
             {
                 if (CB_Form.Items.Count == 2) // actually M/F; Pumpkaboo formes in German are S,M,L,XL
-                    Label_Gender.Text = gendersymbols[PKX.GetGenderFromString(CB_Form.Text)];
+                {
+                    pkm.Gender = CB_Form.SelectedIndex;
+                    UpdateGender();
+                }
             }
+            else
+                UpdateGender();
 
             if (ChangingFields)
                 return;