diff --git a/app/controllers/bubbles/assignments_controller.rb b/app/controllers/bubbles/assignments_controller.rb
index f7cada259..cb8e0d677 100644
--- a/app/controllers/bubbles/assignments_controller.rb
+++ b/app/controllers/bubbles/assignments_controller.rb
@@ -2,7 +2,6 @@ class Bubbles::AssignmentsController < ApplicationController
   include BubbleScoped
 
   def new
-    render partial: "bubbles/assignment", locals: { bubble: @bubble }
   end
 
   def create
diff --git a/app/views/bubbles/_assignment.html.erb b/app/views/bubbles/assignments/new.html.erb
similarity index 67%
rename from app/views/bubbles/_assignment.html.erb
rename to app/views/bubbles/assignments/new.html.erb
index d28298c02..992c0b3c4 100644
--- a/app/views/bubbles/_assignment.html.erb
+++ b/app/views/bubbles/assignments/new.html.erb
@@ -1,13 +1,13 @@
-<% cache [ bubble, bubble.bucket ] do %>
-  <%= turbo_frame_tag bubble, :assignment do %>
+<% cache [ @bubble ] do %>
+  <%= 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: bubble_assignments_path(bubble), class: "flex flex-column full-width popup__list", data: { controller: "form" } do |form| %>
-        <% bubble.bucket.users.active.sort_by(&:name).each do |user| %>
+      <%= form_with url: bubble_assignments_path(@bubble), class: "flex flex-column full-width popup__list", data: { controller: "form" } do |form| %>
+        <% @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),
+              checked: @bubble.assigned_to?(user),
               data: { action: "change->form#submit" },
               id: dom_id(user, :assign),
               include_hidden: false,