diff --git a/app/views/cards/assignments/_user.html.erb b/app/views/cards/assignments/_user.html.erb
index 0d4eff888..ebec292b9 100644
--- a/app/views/cards/assignments/_user.html.erb
+++ b/app/views/cards/assignments/_user.html.erb
@@ -1,8 +1,6 @@
-<li class="popup__item" data-filter-target="item" data-navigable-list-target="item" aria-checked="<%= card.assignees.include?(user) %>">
-  <%= button_to card_assignments_path(card, params: { assignee_id: user.id }), method: :post,
-        class: "popup__btn btn", form_class: "max-width flex-item-grow" do %>
-    <span class="overflow-ellipsis flex-item-grow"><%= local_assigns.fetch(:user_label, user.name) %></span>
-    <%= yield if block_given? %>
-    <%= icon_tag "check", size: 18, class: "checked flex-item-no-shrink flex-item-justify-end", style: "--icon-size: 1em" %>
-  <% end %>
-</li>
+<%= button_to card_assignments_path(card, params: { assignee_id: user.id }), method: :post,
+      class: "popup__btn btn", form_class: "max-width flex-item-grow" do %>
+  <span class="overflow-ellipsis flex-item-grow"><%= local_assigns.fetch(:user_label, user.name) %></span>
+  <%= yield if block_given? %>
+  <%= icon_tag "check", size: 18, class: "checked flex-item-no-shrink flex-item-justify-end", style: "--icon-size: 1em" %>
+<% end %>
diff --git a/app/views/cards/assignments/new.html.erb b/app/views/cards/assignments/new.html.erb
index 609478550..726d640f0 100644
--- a/app/views/cards/assignments/new.html.erb
+++ b/app/views/cards/assignments/new.html.erb
@@ -23,9 +23,9 @@
       <% end %>
       <%= render collection: @assigned_to, partial: "user", locals: { card: @card } %>
       <% @users.each do |user| %>
-        <span data-assignment-limit-target="unassigned">
-          <%= render "user", card: @card, user: user %>
-        </span>
+        <li class="popup__item" data-filter-target="item" data-navigable-list-target="item" data-assignment-limit-target="unassigned" aria-checked="<%= @card.assignees.include?(user) %>">
+          <%= render "user", card: @card, user: user, data: { assignment_limit_target: "unassigned" } %>
+        </li>
       <% end %>
     </ul>