diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_FlagWork8b.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_FlagWork8b.cs
index 7a5ed9979..0906d7a20 100644
--- a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_FlagWork8b.cs	
+++ b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_FlagWork8b.cs	
@@ -52,6 +52,9 @@ public SAV_FlagWork8b(SAV8BS sav)
             NUD_System.Text = "0";
             CHK_CustomSystem.Checked = obj.GetSystemFlag(0);
 
+            NUD_Work.Maximum = obj.CountWork - 1;
+            CB_CustomWork.SelectedIndex = 0;
+
             Text = $"{Text} ({sav.Version})";
         }
 
@@ -176,7 +179,7 @@ void ChangeConstValue(object? sender, EventArgs e)
                         return;
 
                     updating = true;
-                    var value = (ushort)mtb.Value;
+                    var value = (int)mtb.Value;
                     var (_, valueID) = map.Find(z => z.Value == value) ?? map[0];
                     if (WinFormsUtil.GetIndex(cb) != valueID)
                         cb.SelectedValue = valueID;