diff --git a/xml/impl/resources/com/intellij/codeInsight/completion/HtmlTextCompletionConfidence.java b/xml/impl/resources/com/intellij/codeInsight/completion/HtmlTextCompletionConfidence.java
index d732b4f7ba11..ec6c806ffa1f 100644
--- a/xml/impl/resources/com/intellij/codeInsight/completion/HtmlTextCompletionConfidence.java
+++ b/xml/impl/resources/com/intellij/codeInsight/completion/HtmlTextCompletionConfidence.java
@@ -34,7 +34,7 @@ public class HtmlTextCompletionConfidence extends CompletionConfidence {
       PsiElement parent = contextElement.getParent();
       if (parent instanceof XmlText || parent instanceof XmlDocument) {
         String prefix = contextElement.getText().substring(0, offset - contextElement.getTextRange().getStartOffset());
-        if (StringUtil.isJavaIdentifier(prefix)) {
+        if (!StringUtil.startsWithChar(prefix, '<') && !StringUtil.startsWithChar(prefix, '&')) {
           return ThreeState.YES;
         }
       }
diff --git a/xml/tests/src/com/intellij/codeInsight/completion/XmlAutopopupTest.java b/xml/tests/src/com/intellij/codeInsight/completion/XmlAutopopupTest.java
index 0afeea7e2867..0323a0de1ed6 100644
--- a/xml/tests/src/com/intellij/codeInsight/completion/XmlAutopopupTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/completion/XmlAutopopupTest.java
@@ -32,7 +32,15 @@ public class XmlAutopopupTest extends CompletionAutoPopupTestCase {
     doTestNoPopup(XHtmlFileType.INSTANCE, "<div><caret></div>", "p");
   }
 
-  public void testAfterTagOpenXhtml() throws Exception {
+  public void testAfterAmpersand() {
+    doTestPopup(HtmlFileType.INSTANCE, "<div>&<caret></div>", "t");
+  }
+
+  public void testDoNotShowPopupAfterQuotedSymbol() {
+    doTestNoPopup(HtmlFileType.INSTANCE, "<div>\"<caret></div>", "s");
+  }
+
+  public void testAfterTagOpenXhtml() {
     doTestPopup(XHtmlFileType.INSTANCE, "<div><caret></div>", "<");
   }