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 83b52a410ce..6eca2f45ebc 100644
--- a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
+++ b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
@@ -388,6 +388,9 @@ fun createSpacingBuilder(settings: CodeStyleSettings, builderUtil: KotlinSpacing
 
             before(INDICES).spaces(0)
             before(WHERE_KEYWORD).spaces(1)
+
+            afterInside(GET_KEYWORD, PROPERTY_ACCESSOR).spaces(0)
+            afterInside(SET_KEYWORD, PROPERTY_ACCESSOR).spaces(0)
         }
         custom {
 
diff --git a/idea/testData/formatter/GetterAndSetter.after.kt b/idea/testData/formatter/GetterAndSetter.after.kt
index 968e48984c1..a1fec98409e 100644
--- a/idea/testData/formatter/GetterAndSetter.after.kt
+++ b/idea/testData/formatter/GetterAndSetter.after.kt
@@ -1,9 +1,9 @@
 class Test {
     var test: Int
-        get () {
+        get() {
             return 0
         }
-        set (value) {
+        set(value) {
             throw NotSupportedException()
         }
 }
\ No newline at end of file
diff --git a/idea/testData/formatter/PropertyAccessors.after.kt b/idea/testData/formatter/PropertyAccessors.after.kt
index dfea0d00587..860d32b087e 100644
--- a/idea/testData/formatter/PropertyAccessors.after.kt
+++ b/idea/testData/formatter/PropertyAccessors.after.kt
@@ -49,4 +49,8 @@ var prop3: Int // Int
     // this comment is for getter
     get() = 1
     // this comment is for setter
+    set(value) {}
+
+val prop4: Int
+    get() = 42
     set(value) {}
\ No newline at end of file
diff --git a/idea/testData/formatter/PropertyAccessors.kt b/idea/testData/formatter/PropertyAccessors.kt
index 68b9bedb5e9..6a9543120d5 100644
--- a/idea/testData/formatter/PropertyAccessors.kt
+++ b/idea/testData/formatter/PropertyAccessors.kt
@@ -52,4 +52,8 @@ var prop3: Int // Int
 // this comment is for getter
 get() = 1
 // this comment is for setter
-set(value) {}
\ No newline at end of file
+set(value) {}
+
+val prop4: Int
+    get     () = 42
+    set   (value) {}
\ No newline at end of file
diff --git a/idea/testData/formatter/SpacesInDeclarations.after.kt b/idea/testData/formatter/SpacesInDeclarations.after.kt
index ad72c4087d2..23a783fdda4 100644
--- a/idea/testData/formatter/SpacesInDeclarations.after.kt
+++ b/idea/testData/formatter/SpacesInDeclarations.after.kt
@@ -45,7 +45,7 @@ public var varWithAccessors1: Int
     get() {
         return 1
     }
-    set  (value: Int) { /**/
+    set(value: Int) { /**/
     }
 
 public var varWithAccessors2: Int