diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
index 18a82dd58dab..acb25ec67a05 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
@@ -557,6 +557,7 @@ class RunConfigurable extends BaseConfigurable {
       .addExtraAction(AnActionButton.fromAction(new MyEditDefaultsAction()))
       .addExtraAction(AnActionButton.fromAction(new MyCreateFolderAction()))
       .addExtraAction(AnActionButton.fromAction(new MySortFolderAction()))
+      .setMinimumSize(new JBDimension(200, 200))
       .setButtonComparator(ExecutionBundle.message("add.new.run.configuration.acrtion.name"),
                            ExecutionBundle.message("remove.run.configuration.action.name"),
                            ExecutionBundle.message("copy.configuration.action.name"),
@@ -620,6 +621,7 @@ class RunConfigurable extends BaseConfigurable {
     });
 
     mySplitter.setFirstComponent(createLeftPanel());
+    mySplitter.setHonorComponentsMinimumSize(true);
     mySplitter.setSecondComponent(myRightPanel);
     myWholePanel.add(mySplitter, BorderLayout.CENTER);
 
diff --git a/platform/platform-api/src/com/intellij/ui/ToolbarDecorator.java b/platform/platform-api/src/com/intellij/ui/ToolbarDecorator.java
index d060e1862e58..4efcf4c53e8c 100644
--- a/platform/platform-api/src/com/intellij/ui/ToolbarDecorator.java
+++ b/platform/platform-api/src/com/intellij/ui/ToolbarDecorator.java
@@ -69,6 +69,7 @@ public abstract class ToolbarDecorator implements CommonActionsPanel.ListenerFac
   private AnActionButtonUpdater myMoveUpActionUpdater = null;
   private AnActionButtonUpdater myMoveDownActionUpdater = null;
   private Dimension myPreferredSize;
+  private Dimension myMinimumSize;
   private CommonActionsPanel myActionsPanel;
   private Comparator<AnActionButton> myButtonComparator;
   private boolean myAsUsualTopToolbar = false;
@@ -311,6 +312,11 @@ public abstract class ToolbarDecorator implements CommonActionsPanel.ListenerFac
     return this;
   }
 
+  public ToolbarDecorator setMinimumSize(Dimension size) {
+    myMinimumSize = size;
+    return this;
+  }
+
   public ToolbarDecorator setVisibleRowCount(int rowCount) {
     return this;//do nothing by default
   }
@@ -336,6 +342,9 @@ public abstract class ToolbarDecorator implements CommonActionsPanel.ListenerFac
     if (myPreferredSize != null) {
       scrollPane.setPreferredSize(myPreferredSize);
     }
+    if (myMinimumSize != null) {
+      scrollPane.setMinimumSize(myMinimumSize);
+    }
     final JPanel panel = new JPanel(new BorderLayout()) {
       @Override
       public void addNotify() {