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 257f529af9d..ffbf371f3d7 100644
--- a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
+++ b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
@@ -301,6 +301,7 @@ fun createSpacingBuilder(settings: CodeStyleSettings, builderUtil: KotlinSpacing
             aroundInside(DOT, USER_TYPE).spaces(0)
 
             around(AS_KEYWORD).spaces(1)
+            around(AS_SAFE).spaces(1)
             around(IS_KEYWORD).spaces(1)
             around(NOT_IS).spaces(1)
             around(IN_KEYWORD).spaces(1)
diff --git a/idea/testData/formatter/SafeCast.after.kt b/idea/testData/formatter/SafeCast.after.kt
new file mode 100644
index 00000000000..96bd8db0ed0
--- /dev/null
+++ b/idea/testData/formatter/SafeCast.after.kt
@@ -0,0 +1,3 @@
+fun main(a: Any) {
+    a as? String
+}
\ No newline at end of file
diff --git a/idea/testData/formatter/SafeCast.kt b/idea/testData/formatter/SafeCast.kt
new file mode 100644
index 00000000000..4230e44c25a
--- /dev/null
+++ b/idea/testData/formatter/SafeCast.kt
@@ -0,0 +1,3 @@
+fun main(a: Any) {
+    a   as?String
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java b/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java
index 3c5b9085ddf..601dab61cc0 100644
--- a/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java
@@ -616,6 +616,11 @@ public class FormatterTestGenerated extends AbstractFormatterTest {
             runTest("idea/testData/formatter/RightBracketOnNewLine.after.kt");
         }
 
+        @TestMetadata("SafeCast.after.kt")
+        public void testSafeCast() throws Exception {
+            runTest("idea/testData/formatter/SafeCast.after.kt");
+        }
+
         @TestMetadata("SaveSpacesInDocComments.after.kt")
         public void testSaveSpacesInDocComments() throws Exception {
             runTest("idea/testData/formatter/SaveSpacesInDocComments.after.kt");