diff --git a/src/language-html/utils.js b/src/language-html/utils.js
index 9dd78fecf90c..efa22ccebaab 100644
--- a/src/language-html/utils.js
+++ b/src/language-html/utils.js
@@ -252,7 +252,11 @@ function isCustomElementWithSurroundingLineBreak(node) {
 }
 
 function isCustomElement(node) {
-  return node.type === "element" && !node.namespace && node.name.includes("-");
+  return (
+    node.type === "element" &&
+    !node.namespace &&
+    (node.name.includes("-") || /[A-Z]/.test(node.name[0]))
+  );
 }
 
 function hasSurroundingLineBreak(node) {
diff --git a/tests/html_attributes/__snapshots__/jsfmt.spec.js.snap b/tests/html_attributes/__snapshots__/jsfmt.spec.js.snap
index ec16f2fce22d..89c4b351537b 100644
--- a/tests/html_attributes/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/html_attributes/__snapshots__/jsfmt.spec.js.snap
@@ -141,7 +141,10 @@ and HTML5 Apps. It also documents Mozilla products, like Firefox OS."
   data-index-number="12314"
   data-parent="cars"
 ></article>
-<X> </X> <X a="1"> </X> <X a="1" b="2"> </X> <X a="1" b="2" c="3"> </X>
+<X> </X>
+<X a="1"> </X>
+<X a="1" b="2"> </X>
+<X a="1" b="2" c="3"> </X>
 <p
   class="
     foo
diff --git a/tests/html_vue/__snapshots__/jsfmt.spec.js.snap b/tests/html_vue/__snapshots__/jsfmt.spec.js.snap
index cfb1254a31cb..030f4cdbaa2c 100644
--- a/tests/html_vue/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/html_vue/__snapshots__/jsfmt.spec.js.snap
@@ -960,6 +960,13 @@ exports[`self_closing.vue - vue-verify 1`] = `
 <script>
 foo( )
 </script>
+
+<div class="container">
+  <HomeH />
+  <HomeA />
+  <HomeX />
+  <HomeY />
+</div>
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 <template>
   <div />
@@ -969,6 +976,13 @@ foo( )
 foo();
 </script>
 
+<div class="container">
+  <HomeH />
+  <HomeA />
+  <HomeX />
+  <HomeY />
+</div>
+
 `;
 
 exports[`self_closing.vue - vue-verify 2`] = `
@@ -979,6 +993,13 @@ exports[`self_closing.vue - vue-verify 2`] = `
 <script>
 foo( )
 </script>
+
+<div class="container">
+  <HomeH />
+  <HomeA />
+  <HomeX />
+  <HomeY />
+</div>
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 <template>
   <div />
@@ -988,6 +1009,13 @@ foo( )
 foo();
 </script>
 
+<div class="container">
+  <HomeH />
+  <HomeA />
+  <HomeX />
+  <HomeY />
+</div>
+
 `;
 
 exports[`self_closing_style.vue - vue-verify 1`] = `
diff --git a/tests/html_vue/self_closing.vue b/tests/html_vue/self_closing.vue
index f6c519de6279..2edb43fb4d8e 100644
--- a/tests/html_vue/self_closing.vue
+++ b/tests/html_vue/self_closing.vue
@@ -5,3 +5,10 @@
 <script>
 foo( )
 </script>
+
+<div class="container">
+  <HomeH />
+  <HomeA />
+  <HomeX />
+  <HomeY />
+</div>