diff --git a/app/components/avo/fields/common/heading_component.html.erb b/app/components/avo/fields/common/heading_component.html.erb
index 93cc1d3ede..5b40a3a2d0 100644
--- a/app/components/avo/fields/common/heading_component.html.erb
+++ b/app/components/avo/fields/common/heading_component.html.erb
@@ -1,4 +1,4 @@
-<%= content_tag :div, class: "flex items-start py-1 leading-tight bg-gray-100 text-gray-500 text-xs", data: @data do %>
+<%= content_tag :div, class: @classes, data: @data do %>
   <div class="py-2 px-6 h-full w-full">
     <% if @field.as_html %>
       <%= sanitize @field.value %>
diff --git a/app/components/avo/fields/common/heading_component.rb b/app/components/avo/fields/common/heading_component.rb
index 47e92787c9..3c4baf5106 100644
--- a/app/components/avo/fields/common/heading_component.rb
+++ b/app/components/avo/fields/common/heading_component.rb
@@ -6,6 +6,7 @@ class Avo::Fields::Common::HeadingComponent < ViewComponent::Base
   def initialize(field:)
     @field = field
     @view = field.resource.view
+    @classes = "flex items-start py-1 leading-tight bg-gray-100 text-gray-500 text-xs #{@field.get_html(:classes, view: @view, element: :wrapper)}"
 
     @data = stimulus_data_attributes
     add_stimulus_attributes_for(field.resource, @data)