diff --git a/src/browser/dom/element.zig b/src/browser/dom/element.zig
index af556b46..6ab70278 100644
--- a/src/browser/dom/element.zig
+++ b/src/browser/dom/element.zig
@@ -60,14 +60,24 @@ pub const Element = struct {
 
     pub fn toInterfaceT(comptime T: type, e: *parser.Element) !T {
         const tagname = try parser.elementGetTagName(e) orelse {
-            // in case of null tagname, return the element as it.
+            // If the owner's document is HTML, assume we have an HTMLElement.
+            const doc = try parser.nodeOwnerDocument(parser.elementToNode(e));
+            if (doc != null and !doc.?.is_html) {
+                return .{ .HTMLElement = @as(*parser.ElementHTML, @ptrCast(e)) };
+            }
+
             return .{ .Element = e };
         };
 
         // TODO SVGElement and MathML are not supported yet.
 
         const tag = parser.Tag.fromString(tagname) catch {
-            // if the tag is invalid, we don't have an HTMLElement.
+            // If the owner's document is HTML, assume we have an HTMLElement.
+            const doc = try parser.nodeOwnerDocument(parser.elementToNode(e));
+            if (doc != null and doc.?.is_html) {
+                return .{ .HTMLElement = @as(*parser.ElementHTML, @ptrCast(e)) };
+            }
+
             return .{ .Element = e };
         };
 
diff --git a/src/browser/polyfill/webcomponents.zig b/src/browser/polyfill/webcomponents.zig
index e38f63f4..2f4f44cd 100644
--- a/src/browser/polyfill/webcomponents.zig
+++ b/src/browser/polyfill/webcomponents.zig
@@ -61,5 +61,7 @@ test "Browser.webcomponents" {
         },
 
         .{ "main.innerHTML", "<lightpanda-test>connected</lightpanda-test>" },
+        .{ "document.createElement('lightpanda-test').dataset", "[object DataSet]" },
+        .{ "document.createElement('lightpanda-test.x').dataset", "[object DataSet]" },
     }, .{});
 }