diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.java b/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.java
index efcbd9ef4ea0..114bfad87f13 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.java
@@ -33,6 +33,7 @@ import com.intellij.openapi.options.SettingsEditor;
 import com.intellij.openapi.ui.FixedSizeButton;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Key;
+import com.intellij.ui.components.JBScrollPane;
 import gnu.trove.THashMap;
 import org.jetbrains.annotations.NotNull;
 
@@ -132,7 +133,9 @@ public class ConfigurationSettingsEditorWrapper extends SettingsEditor<RunnerAnd
     myComponentPlace.add(myEditor.getComponent(), new GridBagConstraints(0,0,1,1,1.0,1.0, GridBagConstraints.NORTHWEST, GridBagConstraints.BOTH, new Insets(0,0,0,0), 0,0));
     myComponentPlace.doLayout();
     myWholePanel.putClientProperty(DataManager.CLIENT_PROPERTY_DATA_PROVIDER, new TypeSafeDataProviderAdapter(new MyDataProvider()));
-    return myWholePanel;
+    final JBScrollPane scrollPane = new JBScrollPane(myWholePanel);
+    scrollPane.setBorder(null);
+    return scrollPane;
   }
 
   public void updateBeforeRunTaskPanel(@NotNull Key<? extends BeforeRunTask> key) {
diff --git a/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.form b/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.form
index 372d21aabcfb..76f8fbc6edd2 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.form
+++ b/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.form
@@ -70,22 +70,15 @@
           <grid row="4" column="1" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
-      <scrollpane class="com.intellij.ui.components.JBScrollPane" id="9da09" binding="myScrollPane">
+      <xy id="49cf" binding="myComponentPlace" layout-manager="XYLayout" hgap="-1" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
           <grid row="1" column="0" row-span="1" col-span="2" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
-        <children>
-          <xy id="49cf" binding="myComponentPlace" layout-manager="XYLayout" hgap="-1" vgap="-1">
-            <margin top="0" left="0" bottom="0" right="0"/>
-            <constraints/>
-            <properties/>
-            <border type="none"/>
-            <children/>
-          </xy>
-        </children>
-      </scrollpane>
+        <children/>
+      </xy>
     </children>
   </grid>
 </form>
diff --git a/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.java b/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.java
index 1a7eea21c846..c795bcc5db3f 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.java
@@ -208,7 +208,6 @@ public final class SingleConfigurationConfigurable<Config extends RunConfigurati
     private JPanel myOutlinePanel;
     private JLabel myWarningLabel;
     private JButton myFixButton;
-    private JScrollPane myScrollPane;
     private Runnable myQuickFix = null;
 
     public MyValidatableComponent() {
@@ -223,7 +222,6 @@ public final class SingleConfigurationConfigurable<Config extends RunConfigurati
 
       myWarningLabel.setIcon(IconLoader.getIcon("/runConfigurations/configurationWarning.png"));
 
-      myScrollPane.setBorder(null);
       myComponentPlace.setLayout(new GridBagLayout());
       myComponentPlace.add(getEditorComponent(),
                            new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0, GridBagConstraints.NORTHWEST, GridBagConstraints.BOTH,