diff --git a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.java b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.java
index eabbb0172e21..4fb04e2fd577 100644
--- a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.java
+++ b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.java
@@ -32,6 +32,7 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiMethodUtil;
 import com.intellij.ui.EditorTextFieldWithBrowseButton;
 import com.intellij.ui.PanelWithAnchor;
+import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -64,7 +65,7 @@ public class ApplicationConfigurable extends SettingsEditor<ApplicationConfigura
     ClassBrowser.createApplicationClassBrowser(project, myModuleSelector).setField(getMainClassField());
     myVersionDetector = new JreVersionDetector();
 
-    setAnchor(myModule.getAnchor());
+    myAnchor = UIUtil.mergeComponentsWithAnchor(myMainClass, myCommonProgramParameters, myAlternativeJREPanel, myModule);
   }
 
   public void applyEditorTo(final ApplicationConfiguration configuration) throws ConfigurationException {
diff --git a/java/execution/impl/src/com/intellij/execution/ui/AlternativeJREPanel.java b/java/execution/impl/src/com/intellij/execution/ui/AlternativeJREPanel.java
index dec59c0dade6..39aa0ed44242 100644
--- a/java/execution/impl/src/com/intellij/execution/ui/AlternativeJREPanel.java
+++ b/java/execution/impl/src/com/intellij/execution/ui/AlternativeJREPanel.java
@@ -42,6 +42,7 @@ public class AlternativeJREPanel extends JPanel implements PanelWithAnchor {
   private final ComponentWithBrowseButton<TextFieldWithHistory> myPathField;
   private final JBCheckBox myCbEnabled;
   final TextFieldWithHistory myFieldWithHistory;
+  private JComponent myAnchor;
 
   public AlternativeJREPanel() {
     super(new GridBagLayout());
@@ -79,6 +80,9 @@ public class AlternativeJREPanel extends JPanel implements PanelWithAnchor {
       }
     });
     enabledChanged();
+
+    setAnchor(myCbEnabled);
+
     updateUI();
   }
 
@@ -112,11 +116,12 @@ public class AlternativeJREPanel extends JPanel implements PanelWithAnchor {
 
   @Override
   public JComponent getAnchor() {
-    return myCbEnabled.getAnchor();
+    return myAnchor;
   }
 
   @Override
   public void setAnchor(JComponent anchor) {
+    myAnchor = anchor;
     myCbEnabled.setAnchor(anchor);
   }
 
diff --git a/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.form b/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.form
index 088e84e16f18..9fff54900ceb 100644
--- a/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.form
+++ b/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.form
@@ -13,7 +13,7 @@
           <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/>
-        <border type="none"/>
+        <border type="empty"/>
         <children>
           <grid id="452da" layout-manager="GridLayoutManager" row-count="6" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
             <margin top="0" left="0" bottom="0" right="0"/>
diff --git a/platform/lang-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java b/platform/lang-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java
index f057643100e7..6d76ab5db4ce 100644
--- a/platform/lang-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java
+++ b/platform/lang-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java
@@ -51,7 +51,7 @@ public class CommonProgramParametersPanel extends JPanel implements PanelWithAnc
   private LabeledComponent<JPanel> myWorkingDirectoryComponent;
   private TextFieldWithBrowseButton myWorkingDirectoryField;
   private EnvironmentVariablesComponent myEnvVariablesComponent;
-  protected JComponent anchor;
+  protected JComponent myAnchor;
 
   private Module myModuleContext = null;
   private boolean myHaveModuleContext = false;
@@ -160,11 +160,11 @@ public class CommonProgramParametersPanel extends JPanel implements PanelWithAnc
   }
 
   public JComponent getAnchor() {
-    return anchor;
+    return myAnchor;
   }
 
   public void setAnchor(JComponent anchor) {
-    this.anchor = anchor;
+    this.myAnchor = anchor;
     myProgramParametersComponent.setAnchor(anchor);
     myWorkingDirectoryComponent.setAnchor(anchor);
     myEnvVariablesComponent.setAnchor(anchor);