diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt b/idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
index ae8f9fc4d39..0573f14d391 100644
--- a/idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
@@ -131,6 +131,7 @@ fun createSpacingBuilder(settings: CodeStyleSettings): KotlinSpacingBuilder {
             betweenInside(VAR_KEYWORD, IDENTIFIER, PROPERTY).spaces(1)
             betweenInside(VAL_KEYWORD, TYPE_REFERENCE, PROPERTY).spaces(1)
             betweenInside(VAR_KEYWORD, TYPE_REFERENCE, PROPERTY).spaces(1)
+            betweenInside(TYPE_PARAMETER_LIST, IDENTIFIER, PROPERTY).spaces(1)
             betweenInside(TYPE_REFERENCE, DOT, PROPERTY).spacing(0, 0, 0, false, 0)
             betweenInside(DOT, IDENTIFIER, PROPERTY).spacing(0, 0, 0, false, 0)
 
diff --git a/idea/testData/formatter/PropertyTypeParameterList.after.kt b/idea/testData/formatter/PropertyTypeParameterList.after.kt
new file mode 100644
index 00000000000..22fc612a8a0
--- /dev/null
+++ b/idea/testData/formatter/PropertyTypeParameterList.after.kt
@@ -0,0 +1,4 @@
+val <T> foo: T?
+    get() {
+        return null
+    }
diff --git a/idea/testData/formatter/PropertyTypeParameterList.kt b/idea/testData/formatter/PropertyTypeParameterList.kt
new file mode 100644
index 00000000000..6495f29e336
--- /dev/null
+++ b/idea/testData/formatter/PropertyTypeParameterList.kt
@@ -0,0 +1,2 @@
+val <T>foo: T?
+    get() { return null}
diff --git a/idea/tests/org/jetbrains/kotlin/formatter/JetFormatterTestGenerated.java b/idea/tests/org/jetbrains/kotlin/formatter/JetFormatterTestGenerated.java
index dbca96cc0c4..a894971153f 100644
--- a/idea/tests/org/jetbrains/kotlin/formatter/JetFormatterTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/formatter/JetFormatterTestGenerated.java
@@ -385,6 +385,12 @@ public class JetFormatterTestGenerated extends AbstractJetFormatterTest {
             doTest(fileName);
         }
 
+        @TestMetadata("PropertyTypeParameterList.after.kt")
+        public void testPropertyTypeParameterList() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/PropertyTypeParameterList.after.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("PropertyWithInference.after.kt")
         public void testPropertyWithInference() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/PropertyWithInference.after.kt");