diff --git a/packages/app-web-docs/src/docs/user/languages/fixtures/xml.json b/packages/app-web-docs/src/docs/user/languages/fixtures/xml.json
index c42c9efb91..500950df26 100644
--- a/packages/app-web-docs/src/docs/user/languages/fixtures/xml.json
+++ b/packages/app-web-docs/src/docs/user/languages/fixtures/xml.json
@@ -50,6 +50,23 @@
       }
     ]
   },
+  {
+    "name": "scopes/xml/element2",
+    "languageId": "xml",
+    "facet": "element",
+    "code": "<name />",
+    "scopes": [
+      {
+        "targets": [
+          {
+            "content": "0:0-0:8",
+            "removal": "0:0-0:8"
+          }
+        ],
+        "domain": "0:0-0:8"
+      }
+    ]
+  },
   {
     "name": "scopes/xml/endTag",
     "languageId": "xml",
diff --git a/packages/app-web-docs/src/docs/user/languages/xml.mdx b/packages/app-web-docs/src/docs/user/languages/xml.mdx
index 3177f3cbb1..1969ce5c12 100644
--- a/packages/app-web-docs/src/docs/user/languages/xml.mdx
+++ b/packages/app-web-docs/src/docs/user/languages/xml.mdx
@@ -67,6 +67,8 @@ Below are visualizations of all our scope tests for this language. These were cr
 
 <ScopeVisualizer fixtureName="scopes/xml/element" languageId="xml" />
 
+<ScopeVisualizer fixtureName="scopes/xml/element2" languageId="xml" />
+
 ### Xml end tag
 
 #### 1. End tag
diff --git a/packages/app-web-docs/src/docs/user/scopes/fixtures/xmlElement.json b/packages/app-web-docs/src/docs/user/scopes/fixtures/xmlElement.json
index 634f6ae5c0..186c7ce3d0 100644
--- a/packages/app-web-docs/src/docs/user/scopes/fixtures/xmlElement.json
+++ b/packages/app-web-docs/src/docs/user/scopes/fixtures/xmlElement.json
@@ -66,5 +66,22 @@
         "domain": "0:0-0:13"
       }
     ]
+  },
+  {
+    "name": "scopes/xml/element2",
+    "languageId": "xml",
+    "facet": "element",
+    "code": "<name />",
+    "scopes": [
+      {
+        "targets": [
+          {
+            "content": "0:0-0:8",
+            "removal": "0:0-0:8"
+          }
+        ],
+        "domain": "0:0-0:8"
+      }
+    ]
   }
 ]
diff --git a/packages/app-web-docs/src/docs/user/scopes/xmlElement.mdx b/packages/app-web-docs/src/docs/user/scopes/xmlElement.mdx
index b6366e826a..8ac7c18055 100644
--- a/packages/app-web-docs/src/docs/user/scopes/xmlElement.mdx
+++ b/packages/app-web-docs/src/docs/user/scopes/xmlElement.mdx
@@ -47,4 +47,6 @@ Default: `element`
 
 <ScopeVisualizer fixtureName="scopes/xml/element" />
 
+<ScopeVisualizer fixtureName="scopes/xml/element2" />
+
 </ScopeVisualizerProvider>
diff --git a/resources/fixtures/scopes/xml/element2.scope b/resources/fixtures/scopes/xml/element2.scope
new file mode 100644
index 0000000000..b1236d22ca
--- /dev/null
+++ b/resources/fixtures/scopes/xml/element2.scope
@@ -0,0 +1,10 @@
+<name />
+---
+
+[Content] =
+[Removal] =
+[Domain] = 0:0-0:8
+  >--------<
+0| <name />
+
+[Insertion delimiter] = "\n"
diff --git a/resources/queries/xml.scm b/resources/queries/xml.scm
index 450008afd4..bc6f1aa79b 100644
--- a/resources/queries/xml.scm
+++ b/resources/queries/xml.scm
@@ -46,21 +46,13 @@
 ;;!       ^^^^
 (CharData) @textFragment
 
-;;!! <aaa>text</aaa>
-;;!  ^^^^^^^^^^^^^^^
-;;!       ^^^^
-(element
-  (STag) @interior.start.endOf
-  (ETag) @interior.end.startOf
-) @xmlElement
-
 ;;!! <aaa>text</aaa>
 ;;!  ^^^^^    ^^^^^^
-;;!  ---------------
+;;!       ^^^^
 (element
-  (STag) @xmlStartTag
-  (ETag) @xmlEndTag
-) @_.domain
+  (STag) @xmlStartTag @interior.start.endOf
+  (ETag) @xmlEndTag @interior.end.startOf
+) @xmlStartTag.domain @xmlEndTag.domain
 
 (element
   [
@@ -70,6 +62,10 @@
   (#allow-multiple! @xmlBothTags)
 ) @_.domain
 
+;;!! <aaa>text</aaa>
+;;!! <aaa/>
+(element) @xmlElement
+
 (element
   (STag) @xmlElement.iteration.start.endOf @xmlBothTags.iteration.start.endOf
   (content