diff --git a/platform/platform-api/src/com/intellij/ui/AnActionButton.java b/platform/platform-api/src/com/intellij/ui/AnActionButton.java index e2c2100a05fc..b231c285b956 100644 --- a/platform/platform-api/src/com/intellij/ui/AnActionButton.java +++ b/platform/platform-api/src/com/intellij/ui/AnActionButton.java @@ -126,7 +126,8 @@ public abstract class AnActionButton extends AnAction implements ShortcutProvide } public void updateButton(AnActionEvent e) { - e.getPresentation().setEnabled(getContextComponent().isShowing()); + final JComponent component = getContextComponent(); + e.getPresentation().setEnabled(component != null && component.isShowing()); } @Override