diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameInsertHandler.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameInsertHandler.java
index c7650c5da451..dcd1e597ae48 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameInsertHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameInsertHandler.java
@@ -72,7 +72,9 @@ class JavaClassNameInsertHandler implements InsertHandler<JavaPsiClassReferenceE
     }
 
     String qname = psiClass.getQualifiedName();
-    if (qname != null && PsiTreeUtil.getParentOfType(position, PsiDocComment.class, false) != null && shouldInsertFqnInJavadoc(item, file, project)) {
+    if (qname != null && PsiTreeUtil.getParentOfType(position, PsiDocComment.class, false) != null &&
+        (ref == null || !ref.isQualified()) &&
+        shouldInsertFqnInJavadoc(item, file, project)) {
       context.getDocument().replaceString(context.getStartOffset(), context.getTailOffset(), qname);
       return;
     }
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavadocCompletionTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavadocCompletionTest.groovy
index 40affc91f59c..abc3726aa774 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavadocCompletionTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavadocCompletionTest.groovy
@@ -646,4 +646,12 @@ class Foo {
     myFixture.completeBasic()
     myFixture.checkResult "/** {@code null}<caret> */"
   }
+
+  public void "test completing inside qualified name"() {
+    myFixture.configureByText 'a.java', "/** @see java.io.<caret> */"
+    myFixture.completeBasic()
+    myFixture.lookup.currentItem = myFixture.lookupElements.find { it.lookupString == 'IOException' }
+    myFixture.type('\n')
+    myFixture.checkResult "/** @see java.io.IOException<caret> */"
+  }
 }