diff --git a/app/views/bubbles/assignments/new.html.erb b/app/views/bubbles/assignments/new.html.erb
index e130994ae..286573068 100644
--- a/app/views/bubbles/assignments/new.html.erb
+++ b/app/views/bubbles/assignments/new.html.erb
@@ -4,10 +4,10 @@
 
     <div class="flex flex-column full-width popup__list">
       <% @bubble.bucket.users.active.alphabetically.each do |user| %>
-        <div class="btn popup__item">
-          <%= button_to user.name, bubble_assignments_path(@bubble, params: { assignee_id: user.id }), method: :post %>
-          <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" if @bubble.assignees.include?(user) %>
-        </div>
+          <%= button_to bubble_assignments_path(@bubble, params: { assignee_id: user.id }), method: :post, class: "btn popup__item full-width" do %>
+            <span class="overflow-ellipsis"><%= user.name %></span>
+            <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" if @bubble.assignees.include?(user) %>
+          <% end %>
       <% end %>
     </div>
   </dialog>
diff --git a/app/views/bubbles/taggings/new.html.erb b/app/views/bubbles/taggings/new.html.erb
index 28ba578f7..4122a8f1d 100644
--- a/app/views/bubbles/taggings/new.html.erb
+++ b/app/views/bubbles/taggings/new.html.erb
@@ -10,12 +10,12 @@
       <% end %>
     <% end %>
 
-    <div class: "flex flex-column full-width popup__list">
+    <div class="flex flex-column full-width popup__list">
       <% @tags.each do |tag| %>
-        <div class="btn popup__item">
-          <%= button_to tag.hashtag, bubble_taggings_path(@bubble, params: { tag_title: tag.title }), method: :post %>
-          <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" if @bubble.tagged_with?(tag) %>
-        </div>
+          <%= button_to bubble_taggings_path(@bubble, params: { tag_title: tag.title }), method: :post, class: "btn full-width popup__item" do %>
+            <span class="overflow-ellipsis"><%= tag.hashtag %></span>
+            <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" if @bubble.tagged_with?(tag) %>
+        <% end %>
       <% end %>
     </div>
   </dialog>