diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt
index be2d1eaf53a..5b97bc51345 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt
@@ -22,6 +22,7 @@ import com.intellij.openapi.editor.Editor
 import com.intellij.psi.PsiDocumentManager
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.descriptors.CallableDescriptor
+import org.jetbrains.kotlin.descriptors.PropertyDescriptor
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade
 import org.jetbrains.kotlin.idea.util.*
@@ -59,9 +60,19 @@ class SpecifyTypeExplicitlyIntention : SelfTargetingIntention<KtCallableDeclarat
     }
 
     companion object {
+
+        private val PropertyDescriptor.getterType: KotlinType?
+            get() = getter?.returnType?.let { if (it.isError) null else it }
+
+        private val PropertyDescriptor.setterType: KotlinType?
+            get() = setter?.valueParameters?.firstOrNull()?.type?.let { if (it.isError) null else it }
+
         fun getTypeForDeclaration(declaration: KtCallableDeclaration): KotlinType {
             val descriptor = declaration.analyze()[BindingContext.DECLARATION_TO_DESCRIPTOR, declaration]
             val type = (descriptor as? CallableDescriptor)?.returnType
+            if (type != null && type.isError && descriptor is PropertyDescriptor) {
+                return descriptor.getterType ?: descriptor.setterType ?: ErrorUtils.createErrorType("null type")
+            }
             return type ?: ErrorUtils.createErrorType("null type")
         }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
index 3d3505e3a15..a72ee0a142e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
@@ -184,6 +184,8 @@ class QuickFixRegistrar : QuickFixContributor {
         UNSAFE_INFIX_CALL.registerFactory(ReplaceInfixCallFix)
 
         AMBIGUOUS_ANONYMOUS_TYPE_INFERRED.registerActions(SpecifyTypeExplicitlyFix())
+        PROPERTY_WITH_NO_TYPE_NO_INITIALIZER.registerActions(SpecifyTypeExplicitlyFix())
+        MUST_BE_INITIALIZED.registerActions(SpecifyTypeExplicitlyFix())
 
         ELSE_MISPLACED_IN_WHEN.registerFactory(MoveWhenElseBranchFix)
         NO_ELSE_IN_WHEN.registerFactory(AddWhenElseBranchFix)
diff --git a/idea/testData/quickfix/typeAddition/propertyWithGetterWithoutType.kt b/idea/testData/quickfix/typeAddition/propertyWithGetterWithoutType.kt
new file mode 100644
index 00000000000..1d9501553d3
--- /dev/null
+++ b/idea/testData/quickfix/typeAddition/propertyWithGetterWithoutType.kt
@@ -0,0 +1,4 @@
+// "Specify type explicitly" "true"
+
+val <caret>x
+    get(): Int = 42
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeAddition/propertyWithGetterWithoutType.kt.after b/idea/testData/quickfix/typeAddition/propertyWithGetterWithoutType.kt.after
new file mode 100644
index 00000000000..dd2e72d7be9
--- /dev/null
+++ b/idea/testData/quickfix/typeAddition/propertyWithGetterWithoutType.kt.after
@@ -0,0 +1,4 @@
+// "Specify type explicitly" "true"
+
+val x: Int
+    get(): Int = 42
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeAddition/propertyWithSetterWithoutType.kt b/idea/testData/quickfix/typeAddition/propertyWithSetterWithoutType.kt
new file mode 100644
index 00000000000..023d98d0443
--- /dev/null
+++ b/idea/testData/quickfix/typeAddition/propertyWithSetterWithoutType.kt
@@ -0,0 +1,12 @@
+// "Specify type explicitly" "true"
+
+class My {
+
+    var yy = 0
+
+    var <caret>y
+        get() = yy
+        set(arg: Int) {
+            yy = arg + 1
+        }
+}
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeAddition/propertyWithSetterWithoutType.kt.after b/idea/testData/quickfix/typeAddition/propertyWithSetterWithoutType.kt.after
new file mode 100644
index 00000000000..c944eb6355f
--- /dev/null
+++ b/idea/testData/quickfix/typeAddition/propertyWithSetterWithoutType.kt.after
@@ -0,0 +1,12 @@
+// "Specify type explicitly" "true"
+
+class My {
+
+    var yy = 0
+
+    var y: Int
+        get() = yy
+        set(arg: Int) {
+            yy = arg + 1
+        }
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
index 6b4250a838f..467d0659683 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
@@ -6775,6 +6775,18 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             doTest(fileName);
         }
 
+        @TestMetadata("propertyWithGetterWithoutType.kt")
+        public void testPropertyWithGetterWithoutType() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/propertyWithGetterWithoutType.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("propertyWithSetterWithoutType.kt")
+        public void testPropertyWithSetterWithoutType() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/propertyWithSetterWithoutType.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("protectedFunWithoutReturnType.kt")
         public void testProtectedFunWithoutReturnType() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/protectedFunWithoutReturnType.kt");