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 9e551b013173..0cb5d42f7031 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
@@ -298,7 +298,8 @@ public abstract class ImportClassFixBase<T extends PsiElement, R extends PsiRefe
 
   @Override
   public boolean fixSilently(@NotNull Editor editor) {
-    return doFix(editor, false, false) == Result.CLASS_AUTO_IMPORTED;
+    return mayAutoImportNow(editor, myElement.getContainingFile()) &&
+           doFix(editor, false, false) == Result.CLASS_AUTO_IMPORTED;
   }
 
   @NotNull
@@ -334,15 +335,9 @@ public abstract class ImportClassFixBase<T extends PsiElement, R extends PsiRefe
 
     boolean canImportHere = true;
 
-    boolean isInModelessContext =  Registry.is("ide.perProjectModality") ?
-                                  !LaterInvocator.isInModalContextForProject(editor.getProject()) :
-                                  !LaterInvocator.isInModalContext();
-
     if (classes.length == 1 &&
         (canImportHere = canImportHere(allowCaretNearRef, editor, psiFile, classes[0].getName())) &&
-        isAddUnambiguousImportsOnTheFlyEnabled(psiFile) &&
-        (ApplicationManager.getApplication().isUnitTestMode() || DaemonListeners.canChangeFileSilently(psiFile)) &&
-        isInModelessContext &&
+        mayAutoImportNow(editor, psiFile) &&
         !autoImportWillInsertUnexpectedCharacters(classes[0])) {
       CommandProcessor.getInstance().runUndoTransparentAction(() -> action.execute());
       return Result.CLASS_AUTO_IMPORTED;
@@ -359,6 +354,18 @@ public abstract class ImportClassFixBase<T extends PsiElement, R extends PsiRefe
     return Result.POPUP_NOT_SHOWN;
   }
 
+  private static boolean mayAutoImportNow(@NotNull Editor editor, @NotNull PsiFile psiFile) {
+    return isAddUnambiguousImportsOnTheFlyEnabled(psiFile) &&
+           (ApplicationManager.getApplication().isUnitTestMode() || DaemonListeners.canChangeFileSilently(psiFile)) &&
+           isInModelessContext(editor);
+  }
+
+  private static boolean isInModelessContext(@NotNull Editor editor) {
+    return Registry.is("ide.perProjectModality") ?
+           !LaterInvocator.isInModalContextForProject(editor.getProject()) :
+           !LaterInvocator.isInModalContext();
+  }
+
   public static boolean isAddUnambiguousImportsOnTheFlyEnabled(@NotNull PsiFile psiFile) {
     return FileTypeUtils.isInServerPageFile(psiFile) ?
            CodeInsightSettings.getInstance().JSP_ADD_UNAMBIGIOUS_IMPORTS_ON_THE_FLY :