diff --git a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs
index 841518e84..16804a3f1 100644
--- a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs	
+++ b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs	
@@ -127,6 +127,7 @@ public bool VerifiedPKM()
         public void InitializeFields()
         {
             // Now that the ComboBoxes are ready, load the data.
+            Stats.SetMainEditor(this);
             FieldsInitialized = true;
             PopulateFields(pkm);
         }
diff --git a/PKHeX.WinForms/Controls/PKM Editor/StatEditor.cs b/PKHeX.WinForms/Controls/PKM Editor/StatEditor.cs
index 3fd2937f9..40aa120a8 100644
--- a/PKHeX.WinForms/Controls/PKM Editor/StatEditor.cs	
+++ b/PKHeX.WinForms/Controls/PKM Editor/StatEditor.cs	
@@ -158,7 +158,7 @@ private void UpdateRandomEVs(object sender, EventArgs e)
         private void UpdateHackedStats(object sender, EventArgs e)
         {
             foreach (var s in MT_Stats)
-                s.Enabled = CHK_HackedStats.Enabled;
+                s.Enabled = CHK_HackedStats.Checked;
             if (!CHK_HackedStats.Checked)
                 UpdateStats();
         }