diff --git a/PKHeX/Subforms/Save Editors/SAV_BoxViewer.cs b/PKHeX/Subforms/Save Editors/SAV_BoxViewer.cs
index e66675e51..488544ff1 100644
--- a/PKHeX/Subforms/Save Editors/SAV_BoxViewer.cs	
+++ b/PKHeX/Subforms/Save Editors/SAV_BoxViewer.cs	
@@ -42,6 +42,9 @@ public SAV_BoxViewer(Main p)
                 pb.DragEnter += pbBoxSlot_DragEnter;
                 pb.QueryContinueDrag += pbBoxSlot_QueryContinueDrag;
             }
+            for (int i = SAV.BoxSlotCount; i < SlotPictureBoxes.Length; i++)
+                SlotPictureBoxes[i].Visible = false;
+
             try
             {
                 CB_BoxSelect.Items.Clear();
@@ -87,7 +90,7 @@ private void setPKXBoxes()
             int boxbgval = SAV.getBoxWallpaper(CB_BoxSelect.SelectedIndex);
             PAN_Box.BackgroundImage = BoxWallpaper.getWallpaper(SAV, boxbgval);
 
-            for (int i = 0; i < SlotPictureBoxes.Length; i++)
+            for (int i = 0; i < SAV.BoxSlotCount; i++)
                 getSlotFiller(boxoffset + SAV.SIZE_STORED*i, SlotPictureBoxes[i]);
         }
         private void getSlotFiller(int offset, PictureBox pb)