diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt b/idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
index b10dd19385a..a64f7673dd5 100644
--- a/idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
@@ -145,6 +145,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)
+            beforeInside(PROPERTY_ACCESSOR, PROPERTY).spacing(1, 0, 0, true, 0)
             betweenInside(VAL_KEYWORD, IDENTIFIER, VALUE_PARAMETER).spaces(1)
             betweenInside(VAR_KEYWORD, IDENTIFIER, VALUE_PARAMETER).spaces(1)
             betweenInside(VAL_KEYWORD, TYPE_REFERENCE, VALUE_PARAMETER).spaces(1)
diff --git a/idea/testData/formatter/PropertyAccessors.after.kt b/idea/testData/formatter/PropertyAccessors.after.kt
new file mode 100644
index 00000000000..f96d99f2785
--- /dev/null
+++ b/idea/testData/formatter/PropertyAccessors.after.kt
@@ -0,0 +1,15 @@
+class Hi {
+    val simple: Int get() = 1
+
+    val newline: String
+        get() = ""
+
+    var getterAndSetter: Int = 0
+        get() = 1
+        set(some) {
+            field = some
+        }
+
+
+    var badNoType get() = 1
+}
diff --git a/idea/testData/formatter/PropertyAccessors.kt b/idea/testData/formatter/PropertyAccessors.kt
new file mode 100644
index 00000000000..7a7e79417f0
--- /dev/null
+++ b/idea/testData/formatter/PropertyAccessors.kt
@@ -0,0 +1,21 @@
+class Hi {
+    val simple: Int          get() = 1
+
+    val newline: String
+
+
+
+               get() = ""
+
+    var getterAndSetter: Int = 0
+
+get() = 1
+
+
+    set(some) {
+            field = some
+        }
+
+
+    var badNoType get() = 1
+}
diff --git a/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java b/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java
index f3cb2eac241..ae00fb65956 100644
--- a/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java
@@ -403,6 +403,12 @@ public class FormatterTestGenerated extends AbstractFormatterTest {
             doTest(fileName);
         }
 
+        @TestMetadata("PropertyAccessors.after.kt")
+        public void testPropertyAccessors() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/PropertyAccessors.after.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("PropertyTypeParameterList.after.kt")
         public void testPropertyTypeParameterList() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/PropertyTypeParameterList.after.kt");