diff --git a/src/Columns/TableViewTemplateColumn.cs b/src/Columns/TableViewTemplateColumn.cs
index c22792c5..1878d7dd 100644
--- a/src/Columns/TableViewTemplateColumn.cs
+++ b/src/Columns/TableViewTemplateColumn.cs
@@ -25,8 +25,10 @@ public TableViewTemplateColumn()
     /// <returns>A ContentControl element.</returns>
     public override FrameworkElement GenerateElement(TableViewCell cell, object? dataItem)
     {
-        var template = CellTemplateSelector?.SelectTemplate(dataItem) ?? CellTemplate;
-        return (template?.LoadContent() as FrameworkElement)!;
+        return new ContentControl
+        {
+            ContentTemplate = CellTemplateSelector?.SelectTemplate(dataItem) ?? CellTemplate
+        };
     }
 
     /// <summary>
@@ -40,8 +42,10 @@ public override FrameworkElement GenerateEditingElement(TableViewCell cell, obje
     {
         if (EditingTemplate is not null || EditingTemplateSelector is not null)
         {
-            var template = EditingTemplateSelector?.SelectTemplate(dataItem) ?? EditingTemplate;
-            return (template?.LoadContent() as FrameworkElement)!;
+            return new ContentControl
+            {
+                ContentTemplate = EditingTemplateSelector?.SelectTemplate(dataItem) ?? EditingTemplate
+            };
         }
 
         return GenerateElement(cell, dataItem);