diff --git a/app/components/avo/field_wrapper_component.html.erb b/app/components/avo/field_wrapper_component.html.erb
index e0eedd610..45c0a8ebd 100644
--- a/app/components/avo/field_wrapper_component.html.erb
+++ b/app/components/avo/field_wrapper_component.html.erb
@@ -17,14 +17,14 @@
     <% end %>
     <% if on_edit? && @field.is_required? %> <span class="text-red-600 ml-1">*</span> <% end %>
   <% end %>
-  <%= content_tag :div, class: class_names("flex-1 flex flex-row md:min-h-inherit px-6",
+  <%= content_tag :div, class: class_names("flex-1 flex flex-row md:min-h-inherit px-6 overflow-x-auto",
     @field.get_html(:classes, view: @view, element: :content),
       {
         "pb-4": stacked?,
         "py-2": !compact?,
         "py-1": compact?,
       }), data: {slot: "value"} do %>
-    <div class="self-center w-full <% unless full_width? || compact? || stacked? %> md:w-8/12 has-sidebar:w-full <% end %>">
+    <div class="self-center w-full break-words <% unless full_width? || compact? || stacked? %> md:w-8/12 has-sidebar:w-full <% end %>">
       <% if on_show? %>
         <% if render_dash? %>
           —
diff --git a/spec/dummy/app/avo/resources/user.rb b/spec/dummy/app/avo/resources/user.rb
index 81636ac29..1e790dd3f 100644
--- a/spec/dummy/app/avo/resources/user.rb
+++ b/spec/dummy/app/avo/resources/user.rb
@@ -120,6 +120,8 @@ def main_panel_fields
       required: true,
       only_on: [:index]
 
+    field :some_token, only_on: :show
+
     field :is_writer, as: :text,
       sortable: -> {
         # Order by something else completely, just to make a test case that clearly and reliably does what we want.
@@ -154,6 +156,7 @@ def test_sidebar
 
   def main_panel_sidebar
     sidebar do
+      field :some_token, only_on: :show
       test_field("Inside main_panel_sidebar")
       with_options only_on: :show do
         field :email, as: :gravatar, link_to_record: true, as_avatar: :circle
diff --git a/spec/dummy/app/models/user.rb b/spec/dummy/app/models/user.rb
index f57b85937..55595f362 100644
--- a/spec/dummy/app/models/user.rb
+++ b/spec/dummy/app/models/user.rb
@@ -104,4 +104,6 @@ def permissions
       delete: true,
     }
   end
+
+  def some_token = @some_token ||= SecureRandom.hex(64)
 end