diff --git a/AppKit/CPButton.j b/AppKit/CPButton.j
index 90afc3e57..7944347cc 100644
--- a/AppKit/CPButton.j
+++ b/AppKit/CPButton.j
@@ -529,7 +529,12 @@ CPButtonImageOffset   = 3.0;
             [self highlight:YES];
     }
     else
-        [self highlight:NO];
+    {
+        if (_showsStateBy & (CPChangeGrayCellMask | CPChangeBackgroundCellMask))
+            [self highlight:[self state] != CPOffState];
+        else
+            [self highlight:NO];
+    }
     return startedTracking;
 }