diff --git a/app/helpers/avatars_helper.rb b/app/helpers/avatars_helper.rb
index 99cd57efa..f3b9e5e2f 100644
--- a/app/helpers/avatars_helper.rb
+++ b/app/helpers/avatars_helper.rb
@@ -20,7 +20,7 @@ module AvatarsHelper
   end
 
   def avatar_preview_tag(user, hidden_for_screen_reader: false, **options)
-    tag.span class: "avatar",
+    tag.span class: class_names("avatar", options.delete(:class)),
       aria: { hidden: hidden_for_screen_reader, label: user.name },
       tabindex: hidden_for_screen_reader ? -1 : nil do
       avatar_image_tag(user, **options)
diff --git a/app/views/cards/display/common/_assignees.html.erb b/app/views/cards/display/common/_assignees.html.erb
index 9dc9264ab..895b29bd9 100644
--- a/app/views/cards/display/common/_assignees.html.erb
+++ b/app/views/cards/display/common/_assignees.html.erb
@@ -1,6 +1,6 @@
 <div class="display-contents" id="<%= dom_id(card, :assignees) %>">
   <% card.assignees.each do |assignee| %>
-    <%= avatar_tag assignee %>
+    <%= avatar_tag assignee, tabindex: (local_assigns.key?(:preview) && local_assigns[:preview]) ? -1 : 0 %>
   <% end %>
 
   <div class="position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside" <%= "hidden" if card.closed? %>>
diff --git a/app/views/cards/display/common/_meta.html.erb b/app/views/cards/display/common/_meta.html.erb
index 8d03eba4a..f2d64c8fc 100644
--- a/app/views/cards/display/common/_meta.html.erb
+++ b/app/views/cards/display/common/_meta.html.erb
@@ -1,7 +1,7 @@
 <div class="card__meta" id="<%= dom_id(card, :meta) %>">
 
   <div class="card__meta-grid card__meta-grid--author">
-    <%= avatar_tag card.creator, class: "card__meta-author" %>
+    <%= avatar_tag card.creator, class: "card__meta-author", tabindex: (local_assigns.key?(:preview) && local_assigns[:preview]) ? -1 : 0 %>
 
     <span class="card__meta-text card__meta-text--added overflow-ellipsis">
       Added <%= local_datetime_tag(card.created_at, style: :daysago) %>
diff --git a/app/views/cards/display/preview/_assignees.html.erb b/app/views/cards/display/preview/_assignees.html.erb
index 3a4655224..523d1ca47 100644
--- a/app/views/cards/display/preview/_assignees.html.erb
+++ b/app/views/cards/display/preview/_assignees.html.erb
@@ -1 +1 @@
-<%= render "cards/display/common/assignees", card: card  %>
+<%= render "cards/display/common/assignees", card: card, preview: true %>
diff --git a/app/views/cards/display/preview/_meta.html.erb b/app/views/cards/display/preview/_meta.html.erb
index 0b25c23f6..8d9940fa2 100644
--- a/app/views/cards/display/preview/_meta.html.erb
+++ b/app/views/cards/display/preview/_meta.html.erb
@@ -1,3 +1,3 @@
-<%= render "cards/display/common/meta", card: card do %>
+<%= render "cards/display/common/meta", card: card, preview: true do %>
   <%= render "cards/display/preview/assignees", card: card %>
 <% end %>
diff --git a/app/views/cards/display/preview/_people.html.erb b/app/views/cards/display/preview/_people.html.erb
index 08319d327..294039f71 100644
--- a/app/views/cards/display/preview/_people.html.erb
+++ b/app/views/cards/display/preview/_people.html.erb
@@ -1,3 +1,3 @@
 <%= render "cards/display/common/people", card: card do%>
-  <%= render "cards/display/preview/assignees", card: card %>
+  <%= render "cards/display/preview/assignees", card: card, preview: true %>
 <% end %>