diff --git a/app/views/bubbles/_assignees.html.erb b/app/views/bubbles/_assignees.html.erb
new file mode 100644
index 000000000..f054bb3ed
--- /dev/null
+++ b/app/views/bubbles/_assignees.html.erb
@@ -0,0 +1,18 @@
+<%= turbo_frame_tag bubble, :assignees do %>
+  <div class="flex">
+    <% bubble.assignees.each do |assignee| %>
+      <%= avatar_tag assignee, loading: :lazy, class: "avatar" %>
+    <% end %>
+
+    <div class="position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
+      <button class="btn card__hide-on-index <%= bubble.creating? || bubble.drafted? ? "fill-highlight" : "fill-transparent" %>" data-action="click->dialog#open:stop">
+        <%= image_tag "add.svg", aria: { hidden: true }, size: 24 %>
+        <span class="for-screen-reader">Assign</span>
+      </button>
+
+      <turbo-frame id="<%= dom_id(bubble, :assignment) %>">
+        <%= render "bubbles/sidebar/assignment", bubble: bubble %>
+      </turbo-frame>
+    </div>
+  </div>
+<% end %>
diff --git a/app/views/bubbles/_people.html.erb b/app/views/bubbles/_people.html.erb
index daf4e311f..68268ce55 100644
--- a/app/views/bubbles/_people.html.erb
+++ b/app/views/bubbles/_people.html.erb
@@ -6,12 +6,7 @@
 
   <div class="card__assignees flex flex-column align-center">
     <span class="txt-uppercase">Assigned</span>
-    <div class="flex">
-      <% bubble.assignees.each do |assignee| %>
-        <%= avatar_tag assignee, loading: :lazy, class: "avatar" %>
-      <% end %>
 
-      <%= render "bubbles/sidebar/assignment", bubble: bubble, users: bubble.bucket.users.active %>
-    </div>
+    <%= render "bubbles/assignees", bubble: bubble %>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/bubbles/sidebar/_assignment.html.erb b/app/views/bubbles/sidebar/_assignment.html.erb
index 8610cf086..72dc42976 100644
--- a/app/views/bubbles/sidebar/_assignment.html.erb
+++ b/app/views/bubbles/sidebar/_assignment.html.erb
@@ -1,14 +1,9 @@
-<div class="position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
-  <button class="btn card__hide-on-index <%= bubble.creating? || bubble.drafted? ? "fill-highlight" : "fill-transparent" %>" data-action="click->dialog#open:stop">
-    <%= image_tag "add.svg", aria: { hidden: true }, size: 24 %>
-    <span class="for-screen-reader">Assign</span>
-  </button>
-
+<%= turbo_frame_tag bubble, :assignment do %>
   <dialog class="popup panel flex-column align-start gap-half fill-white shadow" data-dialog-target="dialog">
     <strong class="popup__title margin-block-start-half pad-inline-half txt-nowrap">Assign this to…</strong>
 
     <%= form_with url: bucket_bubble_assignment_toggles_path(bubble.bucket, bubble), class: "flex flex-column full-width popup__list", data: { controller: "form" } do |form| %>
-      <% users.sort_by(&:name).each do |user| %>
+      <% bubble.bucket.users.active.sort_by(&:name).each do |user| %>
         <div class="btn popup__item">
           <%= form.check_box "assignee_id[]", { 
             checked: bubble.assigned_to?(user),
@@ -23,4 +18,4 @@
       <% end %>
     <% end %>
   </dialog>
-</div>
+<% end %>