diff --git a/app/models/bucket.rb b/app/models/bucket.rb
index f4409a32a..f2476b761 100644
--- a/app/models/bucket.rb
+++ b/app/models/bucket.rb
@@ -5,6 +5,7 @@ class Bucket < ApplicationRecord
   belongs_to :creator, class_name: "User", default: -> { Current.user }
 
   has_many :bubbles, dependent: :destroy
+  has_many :tags, -> { distinct }, through: :bubbles
 
   validates_presence_of :name
 end
diff --git a/app/views/bubbles/_filters.html.erb b/app/views/bubbles/_filters.html.erb
index 61b46a2e1..4e401a04a 100644
--- a/app/views/bubbles/_filters.html.erb
+++ b/app/views/bubbles/_filters.html.erb
@@ -47,7 +47,7 @@
 
     <dialog class="filter__popup panel fill-white shadow" data-dialog-target="dialog">
       <menu class="filter__menu unpad margin-none">
-        <% Current.account.tags.order(:title).each do |tag| %>
+        <% bucket.tags.order(:title).each do |tag| %>
           <li><%= link_to tag.title, bucket_bubbles_path(bucket, bubble_filter_params.merge(tag_id: tag.id)) %></li>
         <% end %>
       </menu>