diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KDocCompletionContributor.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KDocCompletionContributor.kt
index a8317d70900..0792a01477c 100644
--- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KDocCompletionContributor.kt
+++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KDocCompletionContributor.kt
@@ -104,6 +104,9 @@ object KDocTagCompletionProvider: CompletionProvider<CompletionParameters>() {
                 StandardPatterns.character().javaIdentifierPart() or singleCharPattern('@'),
                 StandardPatterns.character().javaIdentifierStart() or singleCharPattern('@'))
 
+        if (prefix.length() > 0 && !prefix.startsWith('@')) {
+            return
+        }
         val resultWithPrefix = result.withPrefixMatcher(prefix)
         KDocKnownTag.values().forEach {
             resultWithPrefix.addElement(LookupElementBuilder.create("@" + it.name().toLowerCase()))
diff --git a/idea/idea-completion/testData/kdoc/NotTagName.kt b/idea/idea-completion/testData/kdoc/NotTagName.kt
new file mode 100644
index 00000000000..dfff7f09b91
--- /dev/null
+++ b/idea/idea-completion/testData/kdoc/NotTagName.kt
@@ -0,0 +1,7 @@
+/**
+ * p<caret>
+ */
+fun f(x: Int): Int {
+}
+
+// ABSENT: @param
diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KDocCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KDocCompletionTestGenerated.java
index d7e08009e1c..fdc99d4315b 100644
--- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KDocCompletionTestGenerated.java
+++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KDocCompletionTestGenerated.java
@@ -41,6 +41,12 @@ public class KDocCompletionTestGenerated extends AbstractJvmBasicCompletionTest
         doTest(fileName);
     }
 
+    @TestMetadata("NotTagName.kt")
+    public void testNotTagName() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/NotTagName.kt");
+        doTest(fileName);
+    }
+
     @TestMetadata("ParamTag.kt")
     public void testParamTag() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/ParamTag.kt");