activeadmin
diff --git a/‎lib/active_admin/filters/active_filter.rb
Lines changed: 3 additions & 1 deletion b/‎lib/active_admin/filters/active_filter.rb
Lines changed: 3 additions & 1 deletion
diff --git a/‎spec/unit/filters/active_filter_spec.rb
Lines changed: 18 additions & 0 deletions b/‎spec/unit/filters/active_filter_spec.rb
Lines changed: 18 additions & 0 deletions
@@ -98,7 +98,9 @@ def find_class
       end
 
       def filter
-        resource.filters[name.to_sym] || resource.filters[condition.key.to_sym]
+        resource.filters[condition.key.to_sym] ||
+          resource.filters[condition.key.remove("_#{condition.predicate.name}").to_sym] ||
+          resource.filters[name.to_sym]
       end
 
       def related_primary_key
 
@@ -190,6 +190,24 @@
         resource.add_filter(:title_or_body_cont, label: label)
         expect(subject.label).to eq("#{label} contains")
       end
+
+      context "when an additional filter exists for one of the fields" do
+        it "should use the filter label as the label prefix" do
+          label = "#{user.first_name}'s Post"
+          resource.add_filter(:title_or_body_cont, label: label)
+          resource.add_filter(:title)
+          expect(subject.label).to eq("#{label} contains")
+        end
+      end
+
+      context "when a filter with a dropdown is searched" do
+        it "should use the filter label as the label prefix" do
+          label = "#{user.first_name}'s Post"
+          resource.add_filter(:title_or_body, filters: [:contains, :equals], label: label)
+          resource.add_filter(:title)
+          expect(subject.label).to eq("#{label} contains")
+        end
+      end
     end
   end