diff --git a/app/helpers/budgets_helper.rb b/app/helpers/budgets_helper.rb
index 906132464..78a3d5a13 100644
--- a/app/helpers/budgets_helper.rb
+++ b/app/helpers/budgets_helper.rb
@@ -53,15 +53,9 @@ module BudgetsHelper
     Budget::Ballot.where(user: current_user, budget: @budget).first
   end
 
-  def investment_tags_select_options(budget)
-    tags = budget.investments.tags_on(:valuation_tags).order(:name).pluck(:name)
-    tags = tags.concat budget.valuation_tag_list
-    tags.uniq
-  end
-
-  def investment_milestone_tags_select_options(budget)
-    tags = budget.investments.tags_on(:milestone_tags).order(:name).pluck(:name)
-    tags = tags.concat budget.milestone_tag_list
+  def investment_tags_select_options(budget, context)
+    tags = budget.investments.tags_on(context).order(:name).pluck(:name)
+    tags = tags.concat budget.tag_list_on(context)
     tags.uniq
   end
 
diff --git a/app/views/admin/budget_investments/_search_form.html.erb b/app/views/admin/budget_investments/_search_form.html.erb
index b6c24b1a1..890700340 100644
--- a/app/views/admin/budget_investments/_search_form.html.erb
+++ b/app/views/admin/budget_investments/_search_form.html.erb
@@ -49,13 +49,13 @@
   </div>
   <div class="small-12 medium-3 column">
     <%= select_tag :tag_name,
-                   options_for_select(investment_tags_select_options(@budget), params[:tag_name]),
+                   options_for_select(investment_tags_select_options(@budget, "valuation_tags"), params[:tag_name]),
                    { prompt: t("admin.budget_investments.index.tags_filter_all") } %>
   </div>
 
   <div class="small-12 medium-3 column">
     <%= select_tag :milestone_tag_name,
-                   options_for_select(investment_milestone_tags_select_options(@budget), params[:milestone_tag_name]),
+                   options_for_select(investment_tags_select_options(@budget, "milestone_tags"), params[:milestone_tag_name]),
                    { prompt: t("admin.budget_investments.index.milestone_tags_filter_all") } %>
   </div>