diff --git a/PKHeX/Subforms/Save Editors/Gen6/SAV_BoxLayout.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_BoxLayout.cs
index a06cfefd0..fd51de3a5 100644
--- a/PKHeX/Subforms/Save Editors/Gen6/SAV_BoxLayout.cs	
+++ b/PKHeX/Subforms/Save Editors/Gen6/SAV_BoxLayout.cs	
@@ -14,8 +14,11 @@ public SAV_BoxLayout(int box)
             
             // Repopulate Wallpaper names
             CB_BG.Items.Clear();
-            foreach (string wallpaper in Main.GameStrings.wallpapernames)
-                CB_BG.Items.Add(wallpaper);
+
+            if (SAV.Generation == 6)
+                CB_BG.Items.AddRange(Main.GameStrings.wallpapernames);
+            else if (SAV.Generation == 7)
+                CB_BG.Items.AddRange(Main.GameStrings.wallpapernames.Take(16).ToArray());
             
             // Go
             LB_BoxSelect.Items.Clear();