diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSpacesPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSpacesPanel.java
index f1553e4bec36..104e300045fb 100644
--- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSpacesPanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSpacesPanel.java
@@ -31,10 +31,10 @@ public class CodeStyleSpacesPanel extends OptionTreeWithPreviewPanel {
   }
 
   protected void initTables() {
-    initBooleanField("SPACE_BEFORE_METHOD_CALL_PARENTHESES", ApplicationBundle.message("checkbox.spaces.method.call.parentheses"),
-                     SPACES_BEFORE_PARENTHESES);
     initBooleanField("SPACE_BEFORE_METHOD_PARENTHESES", ApplicationBundle.message("checkbox.spaces.method.declaration.parentheses"),
                      SPACES_BEFORE_PARENTHESES);
+    initBooleanField("SPACE_BEFORE_METHOD_CALL_PARENTHESES", ApplicationBundle.message("checkbox.spaces.method.call.parentheses"),
+                     SPACES_BEFORE_PARENTHESES);
     initBooleanField("SPACE_BEFORE_IF_PARENTHESES", ApplicationBundle.message("checkbox.spaces.if.parentheses"), SPACES_BEFORE_PARENTHESES);
     initBooleanField("SPACE_BEFORE_FOR_PARENTHESES", ApplicationBundle.message("checkbox.spaces.for.parentheses"),
                      SPACES_BEFORE_PARENTHESES);
diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/WrappingAndBracesPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/WrappingAndBracesPanel.java
index 1322e4ff6ff0..a5ace3b6aca6 100644
--- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/WrappingAndBracesPanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/WrappingAndBracesPanel.java
@@ -119,23 +119,23 @@ public class WrappingAndBracesPanel extends OptionTableWithPreviewPanel {
 
     addOption("EXTENDS_KEYWORD_WRAP", EXTENDS_KEYWORD, SINGLE_ITEM_WRAP_OPTIONS, SINGLE_ITEM_WRAP_VALUES);
 
+    addOption("THROWS_LIST_WRAP", THROWS_LIST, FULL_WRAP_OPTIONS, FULL_WRAP_VALUES);
+    addOption("ALIGN_MULTILINE_THROWS_LIST", ApplicationBundle.message("wrapping.align.when.multiline"), THROWS_LIST);
+    addOption("THROWS_KEYWORD_WRAP", THROWS_KEYWORD, SINGLE_ITEM_WRAP_OPTIONS, SINGLE_ITEM_WRAP_VALUES);
+
     addOption("METHOD_PARAMETERS_WRAP", METHOD_PARAMETERS, FULL_WRAP_OPTIONS, FULL_WRAP_VALUES);
     addOption("ALIGN_MULTILINE_PARAMETERS", ApplicationBundle.message("wrapping.align.when.multiline"), METHOD_PARAMETERS);
     addOption("METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE", ApplicationBundle.message("wrapping.new.line.after.lpar"), METHOD_PARAMETERS);
     addOption("METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE", ApplicationBundle.message("wrapping.rpar.on.new.line"), METHOD_PARAMETERS);
 
-    addOption("ALIGN_MULTILINE_METHOD_BRACKETS", ApplicationBundle.message("wrapping.align.when.multiline"), METHOD_PARENTHESES);
-
-    addOption("THROWS_LIST_WRAP", THROWS_LIST, FULL_WRAP_OPTIONS, FULL_WRAP_VALUES);
-    addOption("ALIGN_MULTILINE_THROWS_LIST", ApplicationBundle.message("wrapping.align.when.multiline"), THROWS_LIST);
-    addOption("THROWS_KEYWORD_WRAP", THROWS_KEYWORD, SINGLE_ITEM_WRAP_OPTIONS, SINGLE_ITEM_WRAP_VALUES);
-
     addOption("CALL_PARAMETERS_WRAP", METHOD_ARGUMENTS_WRAPPING, FULL_WRAP_OPTIONS, FULL_WRAP_VALUES);
     addOption("ALIGN_MULTILINE_PARAMETERS_IN_CALLS", ApplicationBundle.message("wrapping.align.when.multiline"), METHOD_ARGUMENTS_WRAPPING);
     addOption("PREFER_PARAMETERS_WRAP", ApplicationBundle.message("wrapping.take.priority.over.call.chain.wrapping"), METHOD_ARGUMENTS_WRAPPING);
     addOption("CALL_PARAMETERS_LPAREN_ON_NEXT_LINE", ApplicationBundle.message("wrapping.new.line.after.lpar"), METHOD_ARGUMENTS_WRAPPING);
     addOption("CALL_PARAMETERS_RPAREN_ON_NEXT_LINE", ApplicationBundle.message("wrapping.rpar.on.new.line"), METHOD_ARGUMENTS_WRAPPING);
 
+    addOption("ALIGN_MULTILINE_METHOD_BRACKETS", ApplicationBundle.message("wrapping.align.when.multiline"), METHOD_PARENTHESES);
+
     addOption("METHOD_CALL_CHAIN_WRAP", CALL_CHAIN, FULL_WRAP_OPTIONS, FULL_WRAP_VALUES);
     addOption("ALIGN_MULTILINE_CHAINED_METHODS", ApplicationBundle.message("wrapping.align.when.multiline"), CALL_CHAIN);