diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/SwitchStatementGenerator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/SwitchStatementGenerator.java
index 1b96ee8074b2..bbec3a97b49f 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/SwitchStatementGenerator.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/SwitchStatementGenerator.java
@@ -92,8 +92,9 @@ public class SwitchStatementGenerator {
             new ExpressionGenerator(builder, context),
             section
           );
-          builder.append(") {\n");
+          builder.append(") ");
         }
+        builder.append("{\n");
         final ExpressionContext extended = context.extend();
         CodeBlockGenerator generator = new CodeBlockGenerator(builder, extended);
 
@@ -110,8 +111,9 @@ public class SwitchStatementGenerator {
           }
         }
 
+        builder.append("}");
         if (isCase && i + 1 < caseSections.length) {
-          builder.append("}\nelse ");
+          builder.append("\nelse ");
           StringBuilder elseBuilder = new StringBuilder();
           final ExpressionContext elseContext = context.extend();
 
@@ -119,7 +121,9 @@ public class SwitchStatementGenerator {
           GenerationUtil.insertStatementFromContextBefore(builder, elseContext);
           builder.append(elseBuilder);
         }
-        if (context.myStatements.size() > 0) context.setInsertCurlyBrackets();
+        if (context.myStatements.size() > 0) {
+          context.setInsertCurlyBrackets();
+        }
       }
     });
   }
diff --git a/plugins/groovy/testdata/refactoring/convertGroovyToJava/codeBlock/switch3.java b/plugins/groovy/testdata/refactoring/convertGroovyToJava/codeBlock/switch3.java
index b1f9dc5ded69..b3e0f58ec920 100644
--- a/plugins/groovy/testdata/refactoring/convertGroovyToJava/codeBlock/switch3.java
+++ b/plugins/groovy/testdata/refactoring/convertGroovyToJava/codeBlock/switch3.java
@@ -6,5 +6,6 @@ print("bbb");
 else if (org.codehaus.groovy.runtime.DefaultGroovyMethods.isCase(new java.util.Date(45, 1, 2), date)) {
 print("bbb");
 }
-else print("ccc");
-
+else {
+print("ccc");
+}
diff --git a/plugins/groovy/testdata/refactoring/convertGroovyToJava/codeBlock/switch4.java b/plugins/groovy/testdata/refactoring/convertGroovyToJava/codeBlock/switch4.java
index b4f434b1f441..f70673f58d36 100644
--- a/plugins/groovy/testdata/refactoring/convertGroovyToJava/codeBlock/switch4.java
+++ b/plugins/groovy/testdata/refactoring/convertGroovyToJava/codeBlock/switch4.java
@@ -6,5 +6,6 @@ print("bbb");
 else if (org.codehaus.groovy.runtime.DefaultGroovyMethods.isCase(new java.util.ArrayList<java.lang.Integer>(java.util.Arrays.asList(1)), date)) {
 print("bbb");
 }
-else print("ccc");
-
+else {
+print("ccc");
+}