diff --git a/platform/platform-impl/src/com/intellij/application/options/schemes/AbstractSchemesPanel.java b/platform/platform-impl/src/com/intellij/application/options/schemes/AbstractSchemesPanel.java
index 3eab510703d5..a7a468bb989e 100644
--- a/platform/platform-impl/src/com/intellij/application/options/schemes/AbstractSchemesPanel.java
+++ b/platform/platform-impl/src/com/intellij/application/options/schemes/AbstractSchemesPanel.java
@@ -133,6 +133,8 @@ public abstract class AbstractSchemesPanel<T extends Scheme, InfoComponent exten
   private JComponent createToolbar() {
     DefaultActionGroup toolbarActionGroup = new DefaultActionGroup();
     ActionToolbar toolbar = ActionManager.getInstance().createActionToolbar(ActionPlaces.NAVIGATION_BAR_TOOLBAR, toolbarActionGroup, true);
+    toolbar.setReservePlaceAutoPopupIcon(false);
+    toolbar.setLayoutPolicy(ActionToolbar.NOWRAP_LAYOUT_POLICY);
     JComponent toolbarComponent = toolbar.getComponent();
     toolbarActionGroup.add(new ShowSchemesActionsListAction(myActions.getActions(), toolbarComponent));
     toolbarComponent.setMaximumSize(new Dimension(toolbarComponent.getPreferredSize().width, Short.MAX_VALUE));