diff --git a/src/unfold/contrib/filters/forms.py b/src/unfold/contrib/filters/forms.py
index 70000d266..ae4b9b478 100644
--- a/src/unfold/contrib/filters/forms.py
+++ b/src/unfold/contrib/filters/forms.py
@@ -59,7 +59,11 @@ def __init__(
             label=label,
             required=False,
             queryset=field.remote_field.model.objects,
-            widget=self.widget(field, model_admin.admin_site),
+            widget=self.widget(
+                field,
+                model_admin.admin_site,
+                attrs={"class": "unfold-filter-autocomplete"},
+            ),
         )
 
     class Media:
diff --git a/src/unfold/static/unfold/js/select2.init.js b/src/unfold/static/unfold/js/select2.init.js
index fc8f33e3e..c9759e3a0 100644
--- a/src/unfold/static/unfold/js/select2.init.js
+++ b/src/unfold/static/unfold/js/select2.init.js
@@ -18,7 +18,7 @@
     return this;
   };
 
-  $.fn.djangoAdminSelect2 = function () {
+  $.fn.djangoFilterSelect2 = function () {
     $.each(this, function (i, element) {
       $(element).select2({
         ajax: {
@@ -40,13 +40,6 @@
   $(function () {
     $(".unfold-admin-autocomplete.admin-autocomplete").djangoCustomSelect2();
 
-    $(".admin-autocomplete")
-      .not(".unfold-admin-autocomplete")
-      .not("[name*=__prefix__]")
-      .djangoAdminSelect2();
-  });
-
-  document.addEventListener("formset:added", (event) => {
-    $(event.target).find(".admin-autocomplete").djangoAdminSelect2();
+    $(".unfold-filter-autocomplete.admin-autocomplete").djangoFilterSelect2();
   });
 }