diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java
index 1f0ae66d09b..7ba9769d05e 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java
@@ -50,6 +50,12 @@ public class QuickFixFactoryForTypeMismatchError implements JetIntentionActionsF
             actions.add(new CastExpressionFix(expression, expectedType));
         }
 
+        // Property initializer type mismatch property type:
+        JetProperty property = PsiTreeUtil.getParentOfType(expression, JetProperty.class);
+        if (property != null && QuickFixUtil.canEvaluateTo(property.getInitializer(), expression)) {
+            actions.add(new ChangeVariableTypeFix(property, expressionType));
+        }
+
         // Mismatch in returned expression:
         JetFunction function = PsiTreeUtil.getParentOfType(expression, JetFunction.class, true);
         if (function != null && QuickFixUtil.canFunctionReturnExpression(function, expression)) {
diff --git a/idea/testData/quickfix/typeMismatch/afterPropertyTypeMismatch.kt b/idea/testData/quickfix/typeMismatch/afterPropertyTypeMismatch.kt
new file mode 100644
index 00000000000..4302b75770c
--- /dev/null
+++ b/idea/testData/quickfix/typeMismatch/afterPropertyTypeMismatch.kt
@@ -0,0 +1,4 @@
+// "Change 'f' type to '(Long) -> Unit'" "true"
+fun foo() {
+    var f: (Long) -> Unit = if (true) { (x: Long) ->  }<caret> else { (x: Long) ->  }
+}
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeMismatch/beforePropertyTypeMismatch.kt b/idea/testData/quickfix/typeMismatch/beforePropertyTypeMismatch.kt
new file mode 100644
index 00000000000..a1ffc07759c
--- /dev/null
+++ b/idea/testData/quickfix/typeMismatch/beforePropertyTypeMismatch.kt
@@ -0,0 +1,4 @@
+// "Change 'f' type to '(Long) -> Unit'" "true"
+fun foo() {
+    var f: Int = if (true) { (x: Long) ->  }<caret> else { (x: Long) ->  }
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java
index 7dbabee2862..034c2451009 100644
--- a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java
@@ -1286,6 +1286,11 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             doTest("idea/testData/quickfix/typeMismatch/beforeNoReturnInFunctionWithBlockBody.kt");
         }
         
+        @TestMetadata("beforePropertyTypeMismatch.kt")
+        public void testPropertyTypeMismatch() throws Exception {
+            doTest("idea/testData/quickfix/typeMismatch/beforePropertyTypeMismatch.kt");
+        }
+        
         @TestMetadata("beforeReturnTypeMismatch.kt")
         public void testReturnTypeMismatch() throws Exception {
             doTest("idea/testData/quickfix/typeMismatch/beforeReturnTypeMismatch.kt");