diff --git a/BizHawk.Client.EmuHawk/config/ControllerConfig.cs b/BizHawk.Client.EmuHawk/config/ControllerConfig.cs
index b9da7f4d77..b0e9279784 100644
--- a/BizHawk.Client.EmuHawk/config/ControllerConfig.cs
+++ b/BizHawk.Client.EmuHawk/config/ControllerConfig.cs
@@ -107,7 +107,7 @@ namespace BizHawk.Client.EmuHawk
 				buckets[i] = new List<string>();
 			}
 
-			foreach (var button in settings.Keys)
+			foreach (var button in controllerButtons)
 			{
 				int i;
 				for (i = 1; i <= MAXPLAYERS; i++)