diff --git a/js/js.ast/src/org/jetbrains/kotlin/js/backend/JsToStringGenerationVisitor.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/JsToStringGenerationVisitor.java
index 31b2112a950..dce38741b54 100644
--- a/js/js.ast/src/org/jetbrains/kotlin/js/backend/JsToStringGenerationVisitor.java
+++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/JsToStringGenerationVisitor.java
@@ -438,6 +438,7 @@ public class JsToStringGenerationVisitor extends JsVisitor {
         _colon();
 
         popSourceInfo();
+        newlineOpt();
 
         sourceLocationConsumer.pushSourceInfo(null);
         printSwitchMemberStatements(x);
@@ -708,7 +709,7 @@ public class JsToStringGenerationVisitor extends JsVisitor {
         }
         nestedPush(thenStmt);
 
-        if (thenStmt instanceof JsBlock) {
+        if (thenStmt instanceof JsBlock && elseStatement != null) {
             lineBreakAfterBlock = false;
         }