diff --git a/lib/mv_web/live/join_request_live/show.ex b/lib/mv_web/live/join_request_live/show.ex
index 2aab87d..cdc6521 100644
--- a/lib/mv_web/live/join_request_live/show.ex
+++ b/lib/mv_web/live/join_request_live/show.ex
@@ -222,9 +222,9 @@ defmodule MvWeb.JoinRequestLive.Show do
 
   defp field_row(assigns) do
     ~H"""
-    <div class="flex gap-2">
-      <span class="text-base-content/60 min-w-32 shrink-0">{@label}:</span>
-      <span>
+    <dl class="grid gap-1 md:grid-cols-[14rem_minmax(0,1fr)] md:gap-2">
+      <dt class="m-0 text-base-content/60 whitespace-normal break-words">{@label}:</dt>
+      <dd class="m-0 min-w-0">
         <%= if @value && @value != "" do %>
           {@value}
         <% else %>
@@ -232,8 +232,8 @@ defmodule MvWeb.JoinRequestLive.Show do
             {@empty_text || gettext("Not specified")}
           </span>
         <% end %>
-      </span>
-    </div>
+      </dd>
+    </dl>
     """
   end
 
diff --git a/test/mv_web/live/join_request_live/show_test.exs b/test/mv_web/live/join_request_live/show_test.exs
index 35e87dc..5497d22 100644
--- a/test/mv_web/live/join_request_live/show_test.exs
+++ b/test/mv_web/live/join_request_live/show_test.exs
@@ -63,9 +63,9 @@ defmodule MvWeb.JoinRequestLive.ShowTest do
 
       {:ok, view, _html} = live(conn, "/join_requests/#{join_request.id}")
 
-      assert has_element?(view, "span", "#{custom_field.name}:")
-      assert has_element?(view, "span", "Alice Example")
-      refute has_element?(view, "span", "#{custom_field.id}:")
+      assert has_element?(view, "dt", "#{custom_field.name}:")
+      assert has_element?(view, "dd", "Alice Example")
+      refute has_element?(view, "dt", "#{custom_field.id}:")
     end
   end
 end