diff --git a/src/Sitecore.AspNetCore.SDK.RenderingEngine/TagHelpers/Fields/RichTextTagHelper.cs b/src/Sitecore.AspNetCore.SDK.RenderingEngine/TagHelpers/Fields/RichTextTagHelper.cs
index da91a54..7d057ce 100644
--- a/src/Sitecore.AspNetCore.SDK.RenderingEngine/TagHelpers/Fields/RichTextTagHelper.cs
+++ b/src/Sitecore.AspNetCore.SDK.RenderingEngine/TagHelpers/Fields/RichTextTagHelper.cs
@@ -55,7 +55,7 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
         if (Editable && richTextField.OpeningChrome != null)
         {
             html += _chromeRenderer.Render(richTextField.OpeningChrome);
-            html += "<div>";
+            html += "<span>";
         }
 
         bool outputEditableMarkup = Editable && !string.IsNullOrEmpty(richTextField.EditableMarkup);
@@ -65,7 +65,7 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
 
         if (Editable && richTextField.ClosingChrome != null)
         {
-            html += "</div>";
+            html += "</span>";
             html += _chromeRenderer.Render(richTextField.ClosingChrome);
         }
 
diff --git a/src/Sitecore.AspNetCore.SDK.RenderingEngine/TagHelpers/Fields/TextFieldTagHelper.cs b/src/Sitecore.AspNetCore.SDK.RenderingEngine/TagHelpers/Fields/TextFieldTagHelper.cs
index e803b53..789fd65 100644
--- a/src/Sitecore.AspNetCore.SDK.RenderingEngine/TagHelpers/Fields/TextFieldTagHelper.cs
+++ b/src/Sitecore.AspNetCore.SDK.RenderingEngine/TagHelpers/Fields/TextFieldTagHelper.cs
@@ -51,7 +51,7 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
         if (Editable && field.OpeningChrome != null)
         {
             html += _chromeRenderer.Render(field.OpeningChrome);
-            html += "<div>";
+            html += "<span>";
             isHtml = true;
         }
 
@@ -67,7 +67,7 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
 
         if (Editable && field.ClosingChrome != null)
         {
-            html += "</div>";
+            html += "</span>";
             html += _chromeRenderer.Render(field.ClosingChrome);
         }
 
diff --git a/tests/Sitecore.AspNetCore.SDK.RenderingEngine.Tests/TagHelpers/Fields/RichTextTagHelperFixture.cs b/tests/Sitecore.AspNetCore.SDK.RenderingEngine.Tests/TagHelpers/Fields/RichTextTagHelperFixture.cs
index dde4261..6c112e9 100644
--- a/tests/Sitecore.AspNetCore.SDK.RenderingEngine.Tests/TagHelpers/Fields/RichTextTagHelperFixture.cs
+++ b/tests/Sitecore.AspNetCore.SDK.RenderingEngine.Tests/TagHelpers/Fields/RichTextTagHelperFixture.cs
@@ -733,6 +733,7 @@ public void Process_RenderingChromesAreNotNull_ChromesAreOutput(
         // Assert
         chromeRenderer.Received().Render(openingChrome);
         chromeRenderer.Received().Render(closingChrome);
+        tagHelperOutput.Content.GetContent().Should().Be($"{chromeRenderer.Render(openingChrome)}<span>{TestHtml}</span>{chromeRenderer.Render(closingChrome)}");
     }
 
     private static ModelExpression GetModelExpression(Field model)
diff --git a/tests/Sitecore.AspNetCore.SDK.RenderingEngine.Tests/TagHelpers/Fields/TextFieldTagHelperFixture.cs b/tests/Sitecore.AspNetCore.SDK.RenderingEngine.Tests/TagHelpers/Fields/TextFieldTagHelperFixture.cs
index c0e4619..e4c223c 100644
--- a/tests/Sitecore.AspNetCore.SDK.RenderingEngine.Tests/TagHelpers/Fields/TextFieldTagHelperFixture.cs
+++ b/tests/Sitecore.AspNetCore.SDK.RenderingEngine.Tests/TagHelpers/Fields/TextFieldTagHelperFixture.cs
@@ -214,6 +214,7 @@ public void Process_RenderingChromesAreNotNull_ChromesAreOutput(
         // Assert
         chromeRenderer.Received().Render(openingChrome);
         chromeRenderer.Received().Render(closingChrome);
+        tagHelperOutput.Content.GetContent().Should().Be($"{chromeRenderer.Render(openingChrome)}<span>{TestText}</span>{chromeRenderer.Render(closingChrome)}");
     }
 
     private static IEnumerable<object[]> GetModelExpressionTestData()