diff --git a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.form b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.form
index 527234af01d..47a50b2f982 100644
--- a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.form
+++ b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.form
@@ -8,27 +8,11 @@
     <properties/>
     <border type="none"/>
     <children>
-      <component id="6e659" class="javax.swing.JLabel">
-        <constraints>
-          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <text value="Main class:"/>
-        </properties>
-      </component>
       <vspacer id="f22cb">
         <constraints>
           <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
-      <component id="1378e" class="javax.swing.JTextField" binding="myMainClassField">
-        <constraints>
-          <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
-            <preferred-size width="150" height="-1"/>
-          </grid>
-        </constraints>
-        <properties/>
-      </component>
       <grid id="53a18" binding="myModuleChooserHolder" layout-manager="BorderLayout" hgap="0" vgap="0">
         <constraints>
           <grid row="3" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -49,6 +33,15 @@
         </constraints>
         <properties/>
       </component>
+      <component id="a5106" class="com.intellij.openapi.ui.LabeledComponent" binding="mainClass" custom-create="true">
+        <constraints>
+          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <labelLocation value="West"/>
+          <text value="Main class"/>
+        </properties>
+      </component>
     </children>
   </grid>
 </form>
diff --git a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.java b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.java
index a776d040e04..515b6ad9040 100644
--- a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.java
+++ b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.java
@@ -23,6 +23,8 @@ import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SettingsEditor;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.LabeledComponent;
+import com.intellij.ui.PanelWithAnchor;
+import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -30,16 +32,19 @@ import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
-public class JetRunConfigurationEditor extends SettingsEditor<JetRunConfiguration> {
+public class JetRunConfigurationEditor extends SettingsEditor<JetRunConfiguration> implements PanelWithAnchor {
     private JPanel myMainPanel;
     private JTextField myMainClassField;
     private JPanel myModuleChooserHolder;
     private CommonJavaParametersPanel myCommonProgramParameters;
     private AlternativeJREPanel alternativeJREPanel;
+    private LabeledComponent<JTextField> mainClass;
     private ConfigurationModuleSelector myModuleSelector;
+    private JComponent anchor;
+    private final LabeledComponent<JComboBox> moduleChooser;
 
     public JetRunConfigurationEditor(Project project) {
-        LabeledComponent<JComboBox> moduleChooser = LabeledComponent.create(new JComboBox(),  "Use classpath and JDK of module:");
+        moduleChooser = LabeledComponent.create(new JComboBox(), "Use classpath and JDK of module:");
         myModuleChooserHolder.add(moduleChooser, BorderLayout.CENTER);
         myModuleSelector = new ConfigurationModuleSelector(project, moduleChooser.getComponent());
         myCommonProgramParameters.setModuleContext(myModuleSelector.getModule());
@@ -49,6 +54,8 @@ public class JetRunConfigurationEditor extends SettingsEditor<JetRunConfiguratio
                 myCommonProgramParameters.setModuleContext(myModuleSelector.getModule());
             }
         });
+
+        anchor = UIUtil.mergeComponentsWithAnchor(mainClass, myCommonProgramParameters, alternativeJREPanel, moduleChooser);
     }
 
     @Override
@@ -77,4 +84,24 @@ public class JetRunConfigurationEditor extends SettingsEditor<JetRunConfiguratio
     @Override
     protected void disposeEditor() {
     }
+
+    @Override
+    public JComponent getAnchor() {
+        return anchor;
+    }
+
+    @Override
+    public void setAnchor(JComponent anchor) {
+        this.anchor = anchor;
+        mainClass.setAnchor(anchor);
+        myCommonProgramParameters.setAnchor(anchor);
+        alternativeJREPanel.setAnchor(anchor);
+        moduleChooser.setAnchor(anchor);
+    }
+
+    private void createUIComponents() {
+        mainClass = new LabeledComponent<JTextField>();
+        myMainClassField = new JTextField();
+        mainClass.setComponent(myMainClassField);
+    }
 }