diff --git a/java/java-impl/src/com/intellij/lang/java/request/createFieldFromUsage.kt b/java/java-impl/src/com/intellij/lang/java/request/createFieldFromUsage.kt
index 53212e6a3b79..e3ebd603689c 100644
--- a/java/java-impl/src/com/intellij/lang/java/request/createFieldFromUsage.kt
+++ b/java/java-impl/src/com/intellij/lang/java/request/createFieldFromUsage.kt
@@ -1,4 +1,4 @@
-// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 @file:JvmName("CreateFieldFromUsage")
 
 package com.intellij.lang.java.request
@@ -15,6 +15,7 @@ import com.intellij.lang.jvm.actions.EP_NAME
 import com.intellij.lang.jvm.actions.groupActionsByType
 import com.intellij.psi.*
 import com.intellij.psi.impl.PsiImplUtil
+import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.psi.util.PsiUtil.resolveClassInClassTypeOnly
 import com.intellij.psi.util.PsiUtilCore
 import com.intellij.psi.util.parentOfType
@@ -115,7 +116,7 @@ private class CreateFieldRequests(val myRef: PsiReferenceExpression) {
     val request = CreateFieldFromJavaUsageRequest(
       modifiers = modifiers,
       reference = myRef,
-      useAnchor = target.toJavaClassOrNull() == ownerClass,
+      useAnchor = ownerClass != null && PsiTreeUtil.isAncestor(target.toJavaClassOrNull(), ownerClass, false),
       isConstant = false
     )
     addRequest(target, request)
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromUsage/afterFromUnfinishedAnonymousClass.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromUsage/afterFromUnfinishedAnonymousClass.java
new file mode 100644
index 000000000000..234002644f79
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromUsage/afterFromUnfinishedAnonymousClass.java
@@ -0,0 +1,7 @@
+// "Create field 'i' in 'A'" "true" 
+class A {
+    private int i<caret>;
+    Object o = new Object() {
+
+    public void f(A a) {
+      a.i = 0;
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromUsage/beforeFromUnfinishedAnonymousClass.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromUsage/beforeFromUnfinishedAnonymousClass.java
new file mode 100644
index 000000000000..e6fe6e8c209f
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromUsage/beforeFromUnfinishedAnonymousClass.java
@@ -0,0 +1,6 @@
+// "Create field 'i' in 'A'" "true" 
+class A {
+    Object o = new Object() {
+
+    public void f(A a) {
+      a.<caret>i = 0;
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/CreateFieldFromUsageTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/CreateFieldFromUsageTest.java
index aa1d4b844286..2af686a523a9 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/CreateFieldFromUsageTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/CreateFieldFromUsageTest.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.java.codeInsight.daemon.quickFix;
 
 import com.intellij.application.options.CodeStyle;
@@ -73,6 +73,8 @@ public class CreateFieldFromUsageTest extends LightQuickFixTestCase {
   public void testInnerGeneric() { doSingleTest(); }
 
   public void testInnerGenericArray() { doSingleTest(); }
+  
+  public void testFromUnfinishedAnonymousClass() { doSingleTest(); }
 
   protected void doSingleTest() {
     doSingleTest(getTestName(false) + ".java");