diff --git a/src/Components/Modules/Gamepad.cpp b/src/Components/Modules/Gamepad.cpp
index d7419a0d..d3182fe5 100644
--- a/src/Components/Modules/Gamepad.cpp
+++ b/src/Components/Modules/Gamepad.cpp
@@ -1730,7 +1730,7 @@ namespace Components
                     (*keys)[keyCount++] = keyNum;
 
                     if (keyCount >= 2)
-                        return keyNum;
+                        return keyCount;
                 }
             }
         }
@@ -1746,7 +1746,7 @@ namespace Components
                     (*keys)[keyCount++] = keyNum;
 
                     if (keyCount >= 2)
-                        return keyNum;
+                        return keyCount;
                 }
             }
         }