diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnqualifiedInnerClassAccessInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnqualifiedInnerClassAccessInspection.java
index 28641a439f6e..bcf19a9ff882 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnqualifiedInnerClassAccessInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnqualifiedInnerClassAccessInspection.java
@@ -108,17 +108,9 @@ public class UnqualifiedInnerClassAccessInspection extends UnqualifiedInnerClass
           }
         }
       }
-      final ReferenceCollector referenceCollector;
-      if (onDemand) {
-        referenceCollector = new ReferenceCollector(qualifiedName, true);
-      }
-      else {
-        referenceCollector = new ReferenceCollector(innerClassName, false);
-      }
-      final PsiClass[] classes = javaFile.getClasses();
-      for (PsiClass psiClass : classes) {
-        psiClass.accept(referenceCollector);
-      }
+      final ReferenceCollector referenceCollector = new ReferenceCollector(onDemand ? qualifiedName : innerClassName, onDemand);
+      javaFile.accept(referenceCollector);
+
       final Collection<PsiJavaCodeReferenceElement> references = referenceCollector.getReferences();
       final SmartPointerManager pointerManager = SmartPointerManager.getInstance(project);
       final List<SmartPsiElementPointer> pointers = new ArrayList<>();
@@ -214,6 +206,9 @@ public class UnqualifiedInnerClassAccessInspection extends UnqualifiedInnerClass
       this.onDemand = onDemand;
     }
 
+    @Override
+    public void visitImportList(PsiImportList list) { }
+
     @Override
     public void visitReferenceElement(PsiJavaCodeReferenceElement reference) {
       super.visitReferenceElement(reference);