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 c4fd5940b2e..257f529af9d 100644
--- a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
+++ b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
@@ -384,6 +384,7 @@ fun createSpacingBuilder(settings: CodeStyleSettings, builderUtil: KotlinSpacing
 
             around(BY_KEYWORD).spaces(1)
             betweenInside(IDENTIFIER, PROPERTY_DELEGATE, PROPERTY).spaces(1)
+            betweenInside(TYPE_REFERENCE, PROPERTY_DELEGATE, PROPERTY).spaces(1)
 
             before(INDICES).spaces(0)
             before(WHERE_KEYWORD).spaces(1)
diff --git a/idea/testData/formatter/By.after.kt b/idea/testData/formatter/By.after.kt
index 0635a912b67..9d08cd8d4e3 100644
--- a/idea/testData/formatter/By.after.kt
+++ b/idea/testData/formatter/By.after.kt
@@ -1,4 +1,5 @@
 class Bar(val r: Runnable) : Runnable by r
 class Foo {
     val bar by lazy { "" }
+    val baz: String by lazy { "" }
 }
diff --git a/idea/testData/formatter/By.kt b/idea/testData/formatter/By.kt
index bba9825e8d2..1d9ff729d12 100644
--- a/idea/testData/formatter/By.kt
+++ b/idea/testData/formatter/By.kt
@@ -1,4 +1,5 @@
 class Bar(val r: Runnable) : Runnable    by  r
 class Foo {
     val bar   by    lazy { "" }
+    val baz: String   by    lazy { "" }
 }