diff --git a/idea/src/org/jetbrains/jet/plugin/completion/JetCompletionContributor.kt b/idea/src/org/jetbrains/jet/plugin/completion/JetCompletionContributor.kt
index b1006eae560..851ea8c15b9 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/JetCompletionContributor.kt
+++ b/idea/src/org/jetbrains/jet/plugin/completion/JetCompletionContributor.kt
@@ -42,6 +42,7 @@ import org.jetbrains.jet.lang.psi.JetProperty
 import org.jetbrains.jet.lang.psi.JetPsiFactory
 import com.intellij.psi.PsiErrorElement
 import com.intellij.psi.search.PsiElementProcessor
+import com.intellij.psi.PsiComment
 
 public class JetCompletionContributor : CompletionContributor() {
 
@@ -192,6 +193,10 @@ public class JetCompletionContributor : CompletionContributor() {
         val position = parameters.getPosition()
         val invocationCount = parameters.getInvocationCount()
 
+        // no completion in comments
+        // TODO: this must be changed if we will have references in doc-comments
+        if (PsiTreeUtil.getParentOfType(position, javaClass<PsiComment>(), false) != null) return true
+
         // no completion inside number literals
         if (AFTER_NUMBER_LITERAL.accepts(position)) return true
 
diff --git a/idea/testData/completion/basic/common/NoCompletionInDocComment.kt b/idea/testData/completion/basic/common/NoCompletionInDocComment.kt
new file mode 100644
index 00000000000..e2f30d01a9e
--- /dev/null
+++ b/idea/testData/completion/basic/common/NoCompletionInDocComment.kt
@@ -0,0 +1,7 @@
+/**
+ * <caret>
+ */
+class C
+
+// INVOCATION_COUNT: 1
+// NUMBER: 0
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java
index e571f044c06..3d31b132ad7 100644
--- a/idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java
@@ -528,6 +528,12 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
             doTest(fileName);
         }
         
+        @TestMetadata("NoCompletionInDocComment.kt")
+        public void testNoCompletionInDocComment() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoCompletionInDocComment.kt");
+            doTest(fileName);
+        }
+        
         @TestMetadata("NoEmptyPackage.kt")
         public void testNoEmptyPackage() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoEmptyPackage.kt");
diff --git a/idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java
index 68870a3e989..92b64de95c9 100644
--- a/idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java
@@ -528,6 +528,12 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
             doTest(fileName);
         }
         
+        @TestMetadata("NoCompletionInDocComment.kt")
+        public void testNoCompletionInDocComment() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoCompletionInDocComment.kt");
+            doTest(fileName);
+        }
+        
         @TestMetadata("NoEmptyPackage.kt")
         public void testNoEmptyPackage() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoEmptyPackage.kt");