diff --git a/idea/src/org/jetbrains/kotlin/idea/KotlinFoldingBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/KotlinFoldingBuilder.kt
index 6f1c26096dd..9cd4ec6eb9c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/KotlinFoldingBuilder.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/KotlinFoldingBuilder.kt
@@ -35,10 +35,7 @@ import org.jetbrains.kotlin.idea.references.mainReference
 import org.jetbrains.kotlin.idea.references.resolveMainReferenceToDescriptors
 import org.jetbrains.kotlin.kdoc.lexer.KDocTokens
 import org.jetbrains.kotlin.lexer.KtTokens
-import org.jetbrains.kotlin.psi.KtCallExpression
-import org.jetbrains.kotlin.psi.KtFile
-import org.jetbrains.kotlin.psi.KtFunctionLiteral
-import org.jetbrains.kotlin.psi.KtImportList
+import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.allChildren
 import org.jetbrains.kotlin.psi.psiUtil.endOffset
 import org.jetbrains.kotlin.psi.psiUtil.referenceExpression
@@ -111,7 +108,7 @@ class KotlinFoldingBuilder : CustomFoldingBuilder(), DumbAware {
         return type == KtNodeTypes.FUNCTION_LITERAL ||
                 (type == KtNodeTypes.BLOCK && parentType != KtNodeTypes.FUNCTION_LITERAL) ||
                 type == KtNodeTypes.CLASS_BODY || type == KtTokens.BLOCK_COMMENT || type == KDocTokens.KDOC ||
-                type == KtNodeTypes.STRING_TEMPLATE || type == KtNodeTypes.PRIMARY_CONSTRUCTOR ||
+                type == KtNodeTypes.STRING_TEMPLATE || type == KtNodeTypes.PRIMARY_CONSTRUCTOR || type == KtNodeTypes.WHEN ||
                 node.shouldFoldCollection(document)
     }
 
@@ -152,6 +149,15 @@ class KotlinFoldingBuilder : CustomFoldingBuilder(), DumbAware {
                 return TextRange(leftParenthesis.startOffset, rightParenthesis.endOffset)
             }
         }
+        
+        if (node.elementType == KtNodeTypes.WHEN) {
+            val whenExpression = node.psi as? KtWhenExpression
+            val openBrace = whenExpression?.openBrace
+            val closeBrace = whenExpression?.closeBrace
+            if (openBrace != null && closeBrace != null) {
+                return TextRange(openBrace.startOffset, closeBrace.endOffset)
+            }
+        }
 
         return node.textRange
     }
diff --git a/idea/testData/folding/checkCollapse/when.kt b/idea/testData/folding/checkCollapse/when.kt
new file mode 100644
index 00000000000..63b2cff0ed4
--- /dev/null
+++ b/idea/testData/folding/checkCollapse/when.kt
@@ -0,0 +1,7 @@
+fun test(i: Int) <fold text='{...}' expand='true'>{
+    when (i) <fold text='{...}' expand='true'>{
+        1 -> println(1)
+        2 -> println(2)
+        else -> println(0)
+    }</fold>
+}</fold>
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/folding/KotlinFoldingTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/folding/KotlinFoldingTestGenerated.java
index 5b9ec372a5a..a6b7d868538 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/folding/KotlinFoldingTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/folding/KotlinFoldingTestGenerated.java
@@ -143,5 +143,10 @@ public class KotlinFoldingTestGenerated extends AbstractKotlinFoldingTest {
         public void testPrimaryConstructor() throws Exception {
             runTest("idea/testData/folding/checkCollapse/primaryConstructor.kt");
         }
+
+        @TestMetadata("when.kt")
+        public void testWhen() throws Exception {
+            runTest("idea/testData/folding/checkCollapse/when.kt");
+        }
     }
 }