diff --git a/AppKit/CPButton.j b/AppKit/CPButton.j
index 51b108ccb..010452048 100644
--- a/AppKit/CPButton.j
+++ b/AppKit/CPButton.j
@@ -535,7 +535,7 @@ CPButtonImageOffset   = 3.0;
 
 - (void)mouseDown:(CPEvent)anEvent
 {
-    if ([self isContinuous])
+    if ([self isEnabled] && [self isContinuous])
     {
         _continuousDelayTimer = [CPTimer scheduledTimerWithTimeInterval:_periodicDelay callback: function()
         {