diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFix.java
index d5433a07222a..fa2499aba022 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFix.java
@@ -107,6 +107,7 @@ public class ImportClassFix extends ImportClassFixBase<PsiJavaCodeReferenceEleme
 
   @Override
   protected boolean canReferenceClass(PsiJavaCodeReferenceElement ref) {
+    if (PsiTreeUtil.getParentOfType(ref, PsiImportStatementBase.class) != null) return false;
     if (ref instanceof PsiReferenceExpression) {
       PsiElement parent = ref.getParent();
       return parent instanceof PsiReferenceExpression || parent instanceof PsiExpressionStatement;
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFixBase.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFixBase.java
index b3609c65c364..3816d22dd7cf 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFixBase.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFixBase.java
@@ -121,13 +121,15 @@ public abstract class ImportClassFixBase<T extends PsiElement, R extends PsiRefe
       if (qName != null) { //filter local classes
         if (qName.indexOf('.') == -1 || !PsiNameHelper.getInstance(project).isQualifiedName(qName)) continue; //do not show classes from default or invalid package
         if (qName.endsWith(name) && (file == null || ImportFilter.shouldImport(file, qName))) {
-          if (isAccessible(aClass, myElement)) {
-            classList.add(aClass);
-          }
+          classList.add(aClass);
         }
       }
     }
 
+    boolean anyAccessibleFound = classList.stream().anyMatch(aClass -> isAccessible(aClass, myElement));
+    PsiManager manager = myElement.getManager();
+    classList.removeIf(aClass -> (anyAccessibleFound || !manager.isInProject(aClass)) && !isAccessible(aClass, myElement));
+
     if (acceptWrongNumberOfTypeParams && referenceHasTypeParameters) {
       final List<PsiClass> candidates = new ArrayList<>();
       for (Iterator<PsiClass> iterator = classList.iterator(); iterator.hasNext(); ) {
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/intention/AddImportActionTest.groovy b/java/java-tests/testSrc/com/intellij/java/codeInsight/intention/AddImportActionTest.groovy
index 7b778d8abfda..6a3621aed2d5 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/intention/AddImportActionTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/intention/AddImportActionTest.groovy
@@ -670,4 +670,14 @@ class Foo {
 '''
     assert myFixture.filterAvailableIntentions("Import class").empty
   }
+
+  void "test inaccessible class from the project"() {
+    myFixture.addClass('package foo; class Foo {}')
+    myFixture.configureByText 'a.java', '''
+class Bar {
+  F<caret>oo abc;
+}  
+'''
+    assert !myFixture.filterAvailableIntentions("Import class").empty
+  }
 }