diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinAbstractUElement.kt b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinAbstractUElement.kt
index f6745ddf06b..41831c36a66 100644
--- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinAbstractUElement.kt
+++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinAbstractUElement.kt
@@ -72,6 +72,11 @@ fun doConvertParent(element: UElement, parent: PsiElement?): UElement? {
     if (result is UEnumConstant && element is UDeclaration) {
         return result.initializingClass
     }
+
+    if (result is USwitchClauseExpressionWithBody && element.psi !is KtWhenCondition) {
+        return result.body
+    }
+
     return result
 }