diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionButton.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionButton.java
index 1c9cd34c9350..13e615887cd6 100644
--- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionButton.java
+++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionButton.java
@@ -92,7 +92,7 @@ public class ActionButton extends JComponent implements ActionButtonComponent {
   }
 
   protected boolean isButtonEnabled() {
-    return myPresentation.isEnabled();
+    return isEnabled() && myPresentation.isEnabled();
   }
 
   private void onMousePresenceChanged(boolean setInfo) {