diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavadocCompletionConfidence.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavadocCompletionConfidence.java
index 181ed46e220d..55ebf3e24192 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavadocCompletionConfidence.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavadocCompletionConfidence.java
@@ -31,6 +31,9 @@ public final class JavadocCompletionConfidence extends CompletionConfidence {
       if (contextElement.textMatches("#")) {
         return ThreeState.NO;
       }
+      if (contextElement.textMatches("##")) {
+        return ThreeState.NO;
+      }
       if (PsiDocToken.isDocToken(contextElement, JavaDocTokenType.DOC_TAG_ATTRIBUTE_NAME) ||
           contextElement instanceof PsiSnippetAttributeValue) {
         return ThreeState.NO;
diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaTypedHandler.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaTypedHandler.java
index f319213891c1..3cac7e3f5531 100644
--- a/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaTypedHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaTypedHandler.java
@@ -219,7 +219,7 @@ public final class JavaTypedHandler extends JavaTypedHandlerBase {
         return false;
       }
 
-      if (!".".equals(lastElement.getText()) && !"#".equals(lastElement.getText())) {
+      if (!".".equals(lastElement.getText()) && !"#".equals(lastElement.getText()) && !"##".equals(lastElement.getText())) {
         return JavaClassReferenceCompletionContributor.findJavaClassReference(file, offset - 1) != null;
       }
       else {