diff --git a/platform/platform-api/src/com/intellij/openapi/ui/SimpleToolWindowPanel.java b/platform/platform-api/src/com/intellij/openapi/ui/SimpleToolWindowPanel.java index 0d7b5777180a..0ae404f593a2 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/SimpleToolWindowPanel.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/SimpleToolWindowPanel.java @@ -19,6 +19,7 @@ import com.intellij.openapi.actionSystem.ActionToolbar; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.ui.switcher.QuickActionProvider; +import com.intellij.util.containers.JBIterable; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.Nullable; @@ -105,8 +106,10 @@ public class SimpleToolWindowPanel extends JPanel implements QuickActionProvider } public List getActions(boolean originalProvider) { - ActionToolbar toolbar = UIUtil.uiTraverser(myToolbar).traverse().filter(ActionToolbar.class).first(); - return toolbar == null ? null : toolbar.getActions(originalProvider); + JBIterable toolbars = UIUtil.uiTraverser(myToolbar).traverse().filter(ActionToolbar.class); + if (toolbars.size() == 0) + return null; + return toolbars.flatten(toolbar -> toolbar.getActions(originalProvider)).toList(); } public JComponent getComponent() {