diff --git a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
index 413f7589ca8..7f15853bf32 100644
--- a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
+++ b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
@@ -319,6 +319,7 @@ fun createSpacingBuilder(settings: CodeStyleSettings, builderUtil: KotlinSpacing
             betweenInside(IDENTIFIER, PROPERTY_DELEGATE, PROPERTY).spaces(1)
 
             before(INDICES).spaces(0)
+            before(WHERE_KEYWORD).spaces(1)
         }
         custom {
 
diff --git a/idea/testData/formatter/WhereClause.after.kt b/idea/testData/formatter/WhereClause.after.kt
index 09a8c621338..61fafbbbbf0 100644
--- a/idea/testData/formatter/WhereClause.after.kt
+++ b/idea/testData/formatter/WhereClause.after.kt
@@ -10,3 +10,7 @@ fun <T> foo()
         where T : NavigationItem,
               T : RustNamedElement {
 }
+
+interface Bound1
+interface Bound2
+class WhereClass1<T> where T : Bound1, T : Bound2
diff --git a/idea/testData/formatter/WhereClause.kt b/idea/testData/formatter/WhereClause.kt
index e26bc36a92a..87cc139e5a6 100644
--- a/idea/testData/formatter/WhereClause.kt
+++ b/idea/testData/formatter/WhereClause.kt
@@ -10,3 +10,7 @@ fun <T> foo()
 where T : NavigationItem,
 T : RustNamedElement {
 }
+
+interface Bound1
+interface Bound2
+class WhereClass1<T>where T : Bound1, T : Bound2