diff --git a/macosx/mac-joypad.mm b/macosx/mac-joypad.mm
index 1bd79334..253238c8 100755
--- a/macosx/mac-joypad.mm
+++ b/macosx/mac-joypad.mm
@@ -283,8 +283,9 @@ void findControls(struct JoypadDevice &device, NSDictionary *properties, NSMutab
     int usagePage = [properties[@kIOHIDElementUsagePageKey] intValue];
     int usage = [properties[@kIOHIDElementUsageKey] intValue];
     if (usagePage == kHIDPage_Button ||
-        (usagePage == kHIDPage_GenericDesktop && (usage == kHIDUsage_GD_DPadUp || usage == kHIDUsage_GD_DPadDown || usage == kHIDUsage_GD_DPadLeft || usage == kHIDUsage_GD_DPadRight))
-        || (usagePage == kHIDPage_Consumer && (usage == kHIDUsage_Csmr_ACProperties || usage == kHIDUsage_Csmr_ACExit)))
+        usagePage == kHIDPage_Consumer ||
+        (usagePage == kHIDPage_GenericDesktop && (usage == kHIDUsage_GD_DPadUp || usage == kHIDUsage_GD_DPadDown || usage == kHIDUsage_GD_DPadLeft || usage == kHIDUsage_GD_DPadRight ||
+                                                  usage == kHIDUsage_GD_Start || usage == kHIDUsage_GD_Select || usage == kHIDUsage_GD_SystemMainMenu)))
     {
         [buttons addObject:properties];
     }