diff --git a/app/controllers/assignments/toggles_controller.rb b/app/controllers/assignments/toggles_controller.rb
index 08562dde4..7882b8a15 100644
--- a/app/controllers/assignments/toggles_controller.rb
+++ b/app/controllers/assignments/toggles_controller.rb
@@ -2,7 +2,7 @@ class Assignments::TogglesController < ApplicationController
   include BubbleScoped, BucketScoped
 
   def new
-    render partial: "bubbles/sidebar/assignment", locals: { bubble: @bubble }
+    render partial: "bubbles/assignment", locals: { bubble: @bubble }
   end
 
   def create
diff --git a/app/controllers/taggings/toggles_controller.rb b/app/controllers/taggings/toggles_controller.rb
index 786271c41..f77df9e5c 100644
--- a/app/controllers/taggings/toggles_controller.rb
+++ b/app/controllers/taggings/toggles_controller.rb
@@ -2,7 +2,7 @@ class Taggings::TogglesController < ApplicationController
   include BubbleScoped, BucketScoped
 
   def new
-    render partial: "bubbles/sidebar/tag", locals: { bubble: @bubble, tags: Current.account.tags }
+    render partial: "bubbles/tagging", locals: { bubble: @bubble, tags: Current.account.tags }
   end
 
   def create
diff --git a/app/views/bubbles/sidebar/_assignment.html.erb b/app/views/bubbles/_assignment.html.erb
similarity index 100%
rename from app/views/bubbles/sidebar/_assignment.html.erb
rename to app/views/bubbles/_assignment.html.erb
diff --git a/app/views/bubbles/sidebar/_tag.html.erb b/app/views/bubbles/_tagging.html.erb
similarity index 97%
rename from app/views/bubbles/sidebar/_tag.html.erb
rename to app/views/bubbles/_tagging.html.erb
index 59223ccc6..ded9eae50 100644
--- a/app/views/bubbles/sidebar/_tag.html.erb
+++ b/app/views/bubbles/_tagging.html.erb
@@ -1,5 +1,5 @@
 <% cache [ bubble, Current.account ] do %>
-  <%= turbo_frame_tag bubble, :tag do %>
+  <%= turbo_frame_tag bubble, :tagging do %>
     <dialog class="popup panel flex-column align-start justify-start fill-white shadow" data-dialog-target="dialog">
       <strong class="popup__title margin-block-half pad-inline-half">Tag this…</strong>
 
diff --git a/app/views/bubbles/_tags.html.erb b/app/views/bubbles/_tags.html.erb
index 4c3072285..82c52772c 100644
--- a/app/views/bubbles/_tags.html.erb
+++ b/app/views/bubbles/_tags.html.erb
@@ -16,7 +16,7 @@
         <span class="for-screen-reader">Add a tag</span>
       </button>
 
-      <%= turbo_frame_tag bubble, :tag, src: new_bucket_bubble_tagging_toggle_path(bubble.bucket, bubble) %>
+      <%= turbo_frame_tag bubble, :tagging, src: new_bucket_bubble_tagging_toggle_path(bubble.bucket, bubble) %>
     </div>
   </div>
 <% end %>