diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateTypeParameterFromUsageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateTypeParameterFromUsageFix.java
index 8b177745d49d..56fdf5402d1e 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateTypeParameterFromUsageFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateTypeParameterFromUsageFix.java
@@ -165,6 +165,7 @@ public class CreateTypeParameterFromUsageFix extends BaseIntentionAction {
       if (parent instanceof PsiMethodCallExpression ||
           parent instanceof PsiJavaCodeReferenceElement ||
           parent instanceof PsiNewExpression ||
+          (parent instanceof PsiTypeElement && parent.getParent() instanceof PsiClassObjectAccessExpression) ||
           element instanceof PsiReferenceExpression) {
         return null;
       }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createTypeParameterFromUsage/beforeClassLiteral.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createTypeParameterFromUsage/beforeClassLiteral.java
new file mode 100644
index 000000000000..b5063fdfdcf9
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createTypeParameterFromUsage/beforeClassLiteral.java
@@ -0,0 +1,7 @@
+// "Create type parameter 'A'" "false"
+
+class B {
+  void foo() {
+    java.lang.Class a = A<caret>.class;
+  }
+}
\ No newline at end of file