diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/PreferByKindWeigher.java b/java/java-impl/src/com/intellij/codeInsight/completion/PreferByKindWeigher.java
index 59bdffd45e1f..5b978f5aeb35 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/PreferByKindWeigher.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/PreferByKindWeigher.java
@@ -263,7 +263,8 @@ public class PreferByKindWeigher extends LookupElementWeigher {
     }
     if (JavaKeywordCompletion.PRIMITIVE_TYPES.contains(keyword) || PsiKeyword.VOID.equals(keyword)) {
       boolean inCallArg = psiElement().withParents(PsiReferenceExpression.class, PsiExpressionList.class).accepts(myPosition);
-      return inCallArg ? ThreeState.NO : ThreeState.UNSURE;
+      boolean inTypeArg = psiElement().inside(PsiReferenceParameterList.class).accepts(myPosition);
+      return inCallArg || inTypeArg ? ThreeState.NO : ThreeState.UNSURE;
     }
     return ThreeState.UNSURE;
   }
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.groovy
index ed0ce35f6a2d..d511480b69ba 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.groovy
@@ -706,7 +706,7 @@ class ContainerUtil extends ContainerUtilRt {
   }
 
   void testPreferExpectedMethodTypeArg() {
-    checkPreferredItems 0, 'String'
+    checkPreferredItems 0, 'String', 'Usage'
   }
 
   void testMethodStatisticsPerQualifierType() {