diff --git a/Source/NSButton.m b/Source/NSButton.m
index 1de1359a8..0d98fda23 100644
--- a/Source/NSButton.m
+++ b/Source/NSButton.m
@@ -300,7 +300,7 @@ id _nsbuttonCellClass = nil;
 //
 - (BOOL) acceptsFirstResponder
 {
-  return [_cell acceptsFirstResponder] || ([self keyEquivalent] != nil);
+  return [self isEnabled];
 }
 
 - (void) keyDown: (NSEvent*)theEvent