diff --git a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaReferenceAdjuster.java b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaReferenceAdjuster.java
index 446a6a2b4aa0..c06976774177 100644
--- a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaReferenceAdjuster.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaReferenceAdjuster.java
@@ -133,8 +133,13 @@ public class JavaReferenceAdjuster implements ReferenceAdjuster {
     PsiJavaCodeReferenceElement ref = (PsiJavaCodeReferenceElement)element.getPsi();
 
     PsiElement qualifier = ref.getQualifier();
-    if (qualifier instanceof PsiJavaCodeReferenceElement && PsiTreeUtil.getChildOfType(qualifier, PsiAnnotation.class) != null) {
-      return true;
+    if (qualifier instanceof PsiJavaCodeReferenceElement) {
+      if (((PsiJavaCodeReferenceElement)qualifier).resolve() instanceof PsiPackage) {
+        return false;
+      }
+      if (PsiTreeUtil.getChildOfType(qualifier, PsiAnnotation.class) != null) {
+        return true;
+      }
     }
 
     PsiModifierList modifierList = PsiImplUtil.findNeighbourModifierList(ref);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java
index 365c5e66d6c1..48c9d63aa059 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java
@@ -345,7 +345,6 @@ public class PsiImplUtil {
         if (annotationType instanceof PsiClass) {
           return findApplicableTarget((PsiClass)annotationType, types);
         }
-        if (annotationType == null) return null;
       }
     }