diff --git a/app/controllers/taggings/toggles_controller.rb b/app/controllers/taggings/toggles_controller.rb
index f1b611eb7..c528adadd 100644
--- a/app/controllers/taggings/toggles_controller.rb
+++ b/app/controllers/taggings/toggles_controller.rb
@@ -2,16 +2,22 @@ class Taggings::TogglesController < ApplicationController
   include BubbleScoped, BucketScoped
 
   def create
-    @bubble.toggle_tag tag
-    redirect_to @bubble
-  end
+    if params[:tag_title].present?
+      @bubble.toggle_tag Current.account.tags.create!(title: params[:tag_title])
+    else
+      new_tag_ids = Array(params[:tag_id])
+      current_tags = @bubble.tags
 
-  private
-    def tag
-      if params[:tag_title]
-        Tag.new title: params[:tag_title]
-      else
-        Current.account.tags.find params.expect(:tag_id)
+      current_tags.each do |tag|
+        @bubble.toggle_tag(tag) unless new_tag_ids.include?(tag.id.to_s)
+      end
+
+      new_tag_ids.each do |id|
+        tag = Current.account.tags.find(id)
+        @bubble.toggle_tag(tag) unless current_tags.include?(tag)
       end
     end
+
+    redirect_to @bubble
+  end
 end
diff --git a/app/views/bubbles/sidebar/_tag.html.erb b/app/views/bubbles/sidebar/_tag.html.erb
index e2fe107c1..1dd0ab38c 100644
--- a/app/views/bubbles/sidebar/_tag.html.erb
+++ b/app/views/bubbles/sidebar/_tag.html.erb
@@ -4,18 +4,32 @@
     <span>Tag</span>
   </button>
 
-  <dialog class="combox-popup panel align-center gap-half fill-white shadow" data-dialog-target="dialog">
-    <%= form_with url: bucket_bubble_tagging_toggles_path(bubble.bucket, bubble), class: "min-width", data: { controller: "form" } do |form| %>
-      <%= form.combobox :tag_id, tags, required: true, name_when_new: "tag_title",
-            render_in: { partial: "bubbles/tags/listbox_option", as: :tag, locals: { bubble: bubble } },
-            data: { controller: "autofocus", action: "hw-combobox:selection->form#submit" } %>
+  <dialog class="combox-popup panel flex-column align-start gap-half fill-white shadow" style="--panel-border-radius: 1em;" data-dialog-target="dialog">
+    <strong>Add tags…</strong>
+
+    <%= form_with url: bucket_bubble_tagging_toggles_path(bubble.bucket, bubble), class: "flex gap-half align-centerfull-width" do |form| %>
+      <%= form.text_field :tag_title, placeholder: "New tag name...", class: "input txt-small full-width", style: "min-inline-size: 15ch;" %>
+      <%= form.button "Add a tag…", type: "submit", class: "btn txt-small" do %>
+        <%= image_tag "add.svg", aria: { hidden: true }, size: 24 %>
+        <span class="for-screen-reader">Add a tag</span>
+      <% end %>
     <% end %>
 
-    <form method="dialog">
-      <button class="btn txt-small" title="Close (esc)">
-        <%= image_tag "remove.svg", aria: { hidden: true }, size: 24 %>
-        <span class="for-screen-reader">Close</span>
-      </button>
-    </form>
+    <hr class="separator--horizontal full-width">
+
+    <%= form_with url: bucket_bubble_tagging_toggles_path(bubble.bucket, bubble), class: "flex flex-column gap-half full-width", data: { controller: "form" } do |form| %>
+      <% tags.each do |tag| %>
+        <div class="btn full-width borderless justify-start overflow-ellipsis" style="--btn-border-radius: 0.3em;">
+          <%= form.check_box "tag_id[]", { 
+            checked: bubble.tagged_with?(tag),
+            data: { action: "change->form#submit" },
+            id: dom_id(tag, :tag),
+            include_hidden: false,
+          }, tag.id %>
+
+          <%= form.label "tag_id[]", tag.hashtag, for: dom_id(tag, :tag) %>
+        </div>
+      <% end %>
+    <% end %>
   </dialog>
 </div>