diff --git a/PKHeX/Subforms/Save Editors/Gen6/SAV_BoxLayout.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_BoxLayout.cs
index ffb0d7371..a06cfefd0 100644
--- a/PKHeX/Subforms/Save Editors/Gen6/SAV_BoxLayout.cs	
+++ b/PKHeX/Subforms/Save Editors/Gen6/SAV_BoxLayout.cs	
@@ -51,7 +51,7 @@ public SAV_BoxLayout(int box)
                 CB_Unlocked.Items.Clear();
                 for (int i = 0; i < SAV.BoxCount; i++)
                     CB_Unlocked.Items.Add(i + 1);
-                CB_Unlocked.SelectedIndex = SAV.BoxesUnlocked;
+                CB_Unlocked.SelectedIndex = Math.Min(SAV.BoxCount - 1, SAV.BoxesUnlocked);
             }
             else
             {