diff --git a/source/com/intellij/psi/impl/cache/impl/idCache/IdTableBuilding.java b/source/com/intellij/psi/impl/cache/impl/idCache/IdTableBuilding.java
index 30f05524370e..4013e12f4c10 100644
--- a/source/com/intellij/psi/impl/cache/impl/idCache/IdTableBuilding.java
+++ b/source/com/intellij/psi/impl/cache/impl/idCache/IdTableBuilding.java
@@ -171,11 +171,11 @@ public class IdTableBuilding {
     registerCacheBuilder(StdFileTypes.JAVA,new JavaIdCacheBuilder());
     registerCacheBuilder(StdFileTypes.ASPECT,new AspectJIdCacheBuilder());
     registerCacheBuilder(StdFileTypes.XML,new XmlIdCacheBuilder());
-    registerCacheBuilder(StdFileTypes.XHTML,new XmlIdCacheBuilder());
     registerCacheBuilder(StdFileTypes.DTD,new XmlIdCacheBuilder());
 
     registerCacheBuilder(StdFileTypes.HTML,new HtmlIdCacheBuilder());
     registerCacheBuilder(StdFileTypes.XHTML,new XHtmlIdCacheBuilder());
+    registerCacheBuilder(StdFileTypes.JSPX,new XHtmlIdCacheBuilder());
     registerCacheBuilder(StdFileTypes.JSP,new JspIdCacheBuilder());
     registerCacheBuilder(StdFileTypes.PLAIN_TEXT,new TextIdCacheBuilder());
     registerCacheBuilder(StdFileTypes.GUI_DESIGNER_FORM,new FormFileIdCacheBuilder());