diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/kotlinSpacingRules.kt b/idea/src/org/jetbrains/jet/plugin/formatter/kotlinSpacingRules.kt
index e08e70d500d..91bc1a754c6 100644
--- a/idea/src/org/jetbrains/jet/plugin/formatter/kotlinSpacingRules.kt
+++ b/idea/src/org/jetbrains/jet/plugin/formatter/kotlinSpacingRules.kt
@@ -259,6 +259,7 @@ fun createSpacingBuilder(settings: CodeStyleSettings): KotlinSpacingBuilder {
             afterInside(LBRACE, BLOCK).lineBreakInCode()
             beforeInside(RBRACE, CLASS_BODY).lineBreakInCode()
             beforeInside(RBRACE, BLOCK).lineBreakInCode()
+            beforeInside(RBRACE, WHEN).lineBreakInCode()
             between(RPAR, BODY).spaces(1)
 
             // if when entry has block, spacing after arrow should be set by lbrace rule
diff --git a/idea/testData/formatter/When.after.inv.kt b/idea/testData/formatter/When.after.inv.kt
index 0a105c79269..d438d0d6c24 100644
--- a/idea/testData/formatter/When.after.inv.kt
+++ b/idea/testData/formatter/When.after.inv.kt
@@ -28,6 +28,9 @@ fun some(x: Any) {
     when (true) {
 
     }
+
+    when {
+    }
 }
 
 // SET_FALSE: ALIGN_IN_COLUMNS_CASE_BRANCH
\ No newline at end of file
diff --git a/idea/testData/formatter/When.after.kt b/idea/testData/formatter/When.after.kt
index a2237d8f753..7e4f33040b9 100644
--- a/idea/testData/formatter/When.after.kt
+++ b/idea/testData/formatter/When.after.kt
@@ -28,6 +28,9 @@ fun some(x: Any) {
     when (true) {
 
     }
+
+    when {
+    }
 }
 
 // SET_FALSE: ALIGN_IN_COLUMNS_CASE_BRANCH
\ No newline at end of file
diff --git a/idea/testData/formatter/When.kt b/idea/testData/formatter/When.kt
index 616c0f13a06..b48ddce8f80 100644
--- a/idea/testData/formatter/When.kt
+++ b/idea/testData/formatter/When.kt
@@ -39,6 +39,8 @@ else->1
     {
 
     }
+
+    when {}
 }
 
 // SET_FALSE: ALIGN_IN_COLUMNS_CASE_BRANCH
\ No newline at end of file