diff --git a/AppKit/CPButton.j b/AppKit/CPButton.j
index e3d9b7bdc..7853d1d5d 100644
--- a/AppKit/CPButton.j
+++ b/AppKit/CPButton.j
@@ -973,7 +973,11 @@ CPButtonImageOffset   = 3.0;
     _bezelStyle = aBezelStyle;
 
     if (_bezelState && newState)
+    {
+        if (currentState)
+            _bezelState =_bezelState.without(currentState);
         _bezelState = _bezelState.and(newState);
+    }
     else
         _bezelState = newState || CPThemeStateNormal;