diff --git a/src/BizHawk.Client.Common/Controller.cs b/src/BizHawk.Client.Common/Controller.cs
index e359e2349a..a28bf42734 100644
--- a/src/BizHawk.Client.Common/Controller.cs
+++ b/src/BizHawk.Client.Common/Controller.cs
@@ -68,6 +68,7 @@ namespace BizHawk.Client.Common
 					if (finalHostController.IsPressed(button))
 					{
 						_buttons[k] = true;
+						break;
 					}
 				}
 			}
diff --git a/src/BizHawk.Client.Common/controllers/AutofireController.cs b/src/BizHawk.Client.Common/controllers/AutofireController.cs
index dd739accc5..11b911b1e5 100644
--- a/src/BizHawk.Client.Common/controllers/AutofireController.cs
+++ b/src/BizHawk.Client.Common/controllers/AutofireController.cs
@@ -80,6 +80,7 @@ namespace BizHawk.Client.Common
 					if (controller.IsPressed(button))
 					{
 						_buttons[k] = true;
+						break;
 					}
 				}
 			}