diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java b/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java
index 1e75ed039e7..f4f6e76756d 100644
--- a/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java
+++ b/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java
@@ -89,6 +89,7 @@ public class JetFormattingModelBuilder implements FormattingModelBuilder {
                 .beforeInside(GT, TYPE_ARGUMENT_LIST).spaces(0)
 
                 .betweenInside(FOR_KEYWORD, LPAR, FOR).spacing(1, 1, 0, false, 0)
+                .betweenInside(IF_KEYWORD, LPAR, IF).spacing(1, 1, 0, false, 0)
 
                 // TODO: Ask for better API
                 // Type of the declaration colon
diff --git a/idea/testData/formatter/IfSpacing.after.kt b/idea/testData/formatter/IfSpacing.after.kt
new file mode 100644
index 00000000000..844919a3500
--- /dev/null
+++ b/idea/testData/formatter/IfSpacing.after.kt
@@ -0,0 +1,8 @@
+fun f() {
+    if (1 == 2) {
+    }
+    if (1 == 2) {
+    }
+    if (1 == 2) {
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/formatter/IfSpacing.kt b/idea/testData/formatter/IfSpacing.kt
new file mode 100644
index 00000000000..da0c59d01cf
--- /dev/null
+++ b/idea/testData/formatter/IfSpacing.kt
@@ -0,0 +1,9 @@
+fun f() {
+    if   (1 == 2) {
+    }
+    if(1 == 2) {
+    }
+    if
+    (1 == 2) {
+    }
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java b/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java
index 4a42569288a..7048e88cf49 100644
--- a/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java
@@ -107,6 +107,11 @@ public class JetFormatterTestGenerated extends AbstractJetFormatterTest {
         doTest("idea/testData/formatter/If.kt");
     }
     
+    @TestMetadata("IfSpacing.kt")
+    public void testIfSpacing() throws Exception {
+        doTest("idea/testData/formatter/IfSpacing.kt");
+    }
+    
     @TestMetadata("KDoc.kt")
     public void testKDoc() throws Exception {
         doTest("idea/testData/formatter/KDoc.kt");