diff --git a/platform/platform-resources/src/META-INF/XmlPlugin.xml b/platform/platform-resources/src/META-INF/XmlPlugin.xml
index 0d62124eec94..4481fd8bee26 100644
--- a/platform/platform-resources/src/META-INF/XmlPlugin.xml
+++ b/platform/platform-resources/src/META-INF/XmlPlugin.xml
@@ -128,6 +128,7 @@
     <completion.confidence language="XML" implementationClass="com.intellij.codeInsight.completion.XmlNameCompletionConfidence" id="xml"/>
     <completion.confidence language="HTML" implementationClass="com.intellij.codeInsight.completion.XmlNameCompletionConfidence" id="html"/>
     <completion.confidence language="HTML" implementationClass="com.intellij.codeInsight.completion.HtmlTextCompletionConfidence" id="htmlText"/>
+    <completion.confidence language="XHTML" implementationClass="com.intellij.codeInsight.completion.HtmlTextCompletionConfidence" id="xhtmlText"/>
 
     <lookup.charFilter implementation="com.intellij.codeInsight.completion.XmlCharFilter" id="xml"/>
 
diff --git a/xml/tests/src/com/intellij/codeInsight/completion/XmlAutopopupTest.java b/xml/tests/src/com/intellij/codeInsight/completion/XmlAutopopupTest.java
index b08b95d9d839..0afeea7e2867 100644
--- a/xml/tests/src/com/intellij/codeInsight/completion/XmlAutopopupTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/completion/XmlAutopopupTest.java
@@ -16,6 +16,7 @@
 package com.intellij.codeInsight.completion;
 
 import com.intellij.ide.highlighter.HtmlFileType;
+import com.intellij.ide.highlighter.XHtmlFileType;
 import com.intellij.openapi.fileTypes.FileType;
 
 public class XmlAutopopupTest extends CompletionAutoPopupTestCase {
@@ -27,12 +28,20 @@ public class XmlAutopopupTest extends CompletionAutoPopupTestCase {
     doTestPopup(HtmlFileType.INSTANCE, "<div><caret></div>", "<");
   }
 
+  public void testDoNotShowPopupInTextXhtml() throws Exception {
+    doTestNoPopup(XHtmlFileType.INSTANCE, "<div><caret></div>", "p");
+  }
+
+  public void testAfterTagOpenXhtml() throws Exception {
+    doTestPopup(XHtmlFileType.INSTANCE, "<div><caret></div>", "<");
+  }
+
   private void doTestPopup(FileType fileType, String fileText, String typeString) {
     myFixture.configureByText(fileType, fileText);
     type(typeString);
     assertNotNull(getLookup());
   }
-  
+
   private void doTestNoPopup(FileType fileType, String fileText, String typeString) {
     myFixture.configureByText(fileType, fileText);
     type(typeString);