diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightClass.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightClass.kt
index c761aae849b..cdd0651e66a 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightClass.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightClass.kt
@@ -546,7 +546,7 @@ open class KtUltraLightClass(classOrObject: KtClassOrObject, internal val suppor
                     return when (name) {
                         PsiModifier.FINAL -> !isInterface && outer !is KtConstructor<*> && isFinal(outer)
                         PsiModifier.ABSTRACT -> isInterface || outer.hasModifier(ABSTRACT_KEYWORD)
-                        PsiModifier.STATIC -> forceStatic || isNamedObject() && isJvmStatic(outer)
+                        PsiModifier.STATIC -> forceStatic || isNamedObject() && (isJvmStatic(outer) || isJvmStatic(declaration))
                         PsiModifier.STRICTFP -> declaration is KtFunction && declaration.hasAnnotation(STRICTFP_ANNOTATION_FQ_NAME)
                         PsiModifier.SYNCHRONIZED -> declaration is KtFunction && declaration.hasAnnotation(SYNCHRONIZED_ANNOTATION_FQ_NAME)
                         else -> false
diff --git a/idea/testData/quickfix/autoImports/importKotlinStaticPropertyOverloadedSetterFromJava.test b/idea/testData/quickfix/autoImports/importKotlinStaticPropertyOverloadedSetterFromJava.test
index 7df74292162..b6e3b4df88a 100644
--- a/idea/testData/quickfix/autoImports/importKotlinStaticPropertyOverloadedSetterFromJava.test
+++ b/idea/testData/quickfix/autoImports/importKotlinStaticPropertyOverloadedSetterFromJava.test
@@ -17,7 +17,7 @@ public class Foo {
 package foo
 
 object Bar {
-    var variable: String
+    var variable: String = ""
         @JvmStatic set(value) {
             field = value
         }