diff --git a/xml/impl/src/com/intellij/lang/html/HtmlParsing.java b/xml/impl/src/com/intellij/lang/html/HtmlParsing.java
index a6621a8939af..5371b76ce68d 100644
--- a/xml/impl/src/com/intellij/lang/html/HtmlParsing.java
+++ b/xml/impl/src/com/intellij/lang/html/HtmlParsing.java
@@ -229,7 +229,9 @@ public class HtmlParsing {
     // Done header, start content
 
     boolean isInlineTagContainer = HtmlUtil.isInlineTagContainerL(tagName);
-    boolean isOptionalTagEnd = HtmlUtil.isOptionalEndForHtmlTagL(tagName);
+    boolean isOptionalTagEnd = HtmlUtil.isOptionalEndForHtmlTagL(tagName) ||
+                               "body".equalsIgnoreCase(tagName) ||
+                               "html".equalsIgnoreCase(tagName);
 
     PsiBuilder.Marker firstBlockChild = null;