diff --git a/java/java-impl/src/com/intellij/psi/impl/search/JavaIndexPatternBuilder.java b/java/java-impl/src/com/intellij/psi/impl/search/JavaIndexPatternBuilder.java
index 84725cb0b3a3..3b1780d23b77 100644
--- a/java/java-impl/src/com/intellij/psi/impl/search/JavaIndexPatternBuilder.java
+++ b/java/java-impl/src/com/intellij/psi/impl/search/JavaIndexPatternBuilder.java
@@ -15,17 +15,18 @@
  */
 package com.intellij.psi.impl.search;
 
-import com.intellij.lexer.Lexer;
 import com.intellij.lexer.JavaLexer;
+import com.intellij.lexer.Lexer;
+import com.intellij.psi.JavaDocTokenType;
+import com.intellij.psi.JavaTokenType;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiJavaFile;
-import com.intellij.psi.JavaDocTokenType;
-import com.intellij.psi.xml.XmlTokenType;
-import com.intellij.psi.xml.XmlElementType;
 import com.intellij.psi.impl.source.tree.StdTokenSets;
 import com.intellij.psi.jsp.JspFile;
-import com.intellij.psi.tree.TokenSet;
 import com.intellij.psi.tree.IElementType;
+import com.intellij.psi.tree.TokenSet;
+import com.intellij.psi.xml.XmlElementType;
+import com.intellij.psi.xml.XmlTokenType;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -56,6 +57,6 @@ public class JavaIndexPatternBuilder implements IndexPatternBuilder {
   }
 
   public int getCommentEndDelta(final IElementType tokenType) {
-    return 0;
+    return tokenType == JavaTokenType.C_STYLE_COMMENT ? "*/".length() : 0;
   }
 }