diff --git a/AppKit/CPControl.j b/AppKit/CPControl.j
index 54208bf92..ad81ba7d3 100644
--- a/AppKit/CPControl.j
+++ b/AppKit/CPControl.j
@@ -308,6 +308,12 @@ var CPControlBlackColor     = [CPColor blackColor];
     [self highlight:YES];
     [self setState:[self nextState]];
     [self sendAction:[self action] to:[self target]];
+    
+    [CPTimer scheduledTimerWithTimeInterval:0.1 target:self selector:@selector(unhighlightButtonTimerDidFinish:) userInfo:nil repeats:NO];
+}
+
+- (void)unhighlightButtonTimerDidFinish:(id)sender
+{
     [self highlight:NO];
 }