diff --git a/Source/NSButtonCell.m b/Source/NSButtonCell.m
index 68de4abcc..7972f969f 100644
--- a/Source/NSButtonCell.m
+++ b/Source/NSButtonCell.m
@@ -185,7 +185,7 @@
 
 - (void) performClick: (id)sender
 {
-  NSView	*cv = [self controlView];
+  NSView	*cv = [NSView focusView];
 
   [self highlight: YES withFrame: [cv frame] inView: cv];
   if (action)