diff --git a/core/templates/admin/autocomplete_list_filter.html b/core/templates/admin/autocomplete_list_filter.html
index cae75247..760c0e1c 100644
--- a/core/templates/admin/autocomplete_list_filter.html
+++ b/core/templates/admin/autocomplete_list_filter.html
@@ -1,34 +1,33 @@
+{% extends "admin/filter.html" %}
 {% load i18n static %}
 
-<link rel="stylesheet"
-      href="{% static 'admin/css/vendor/select2/select2.css' %}"/>
-<link rel="stylesheet"
-      href="{% static 'admin/css/autocomplete.css' %}"/>
-
-<script src="{% static 'admin/js/jquery.init.js' %}"></script>
-<script src="{% static 'admin/js/vendor/select2/select2.full.js' %}"></script>
-<script src="{% static 'admin/js/autocomplete.js' %}"></script>
-
+{% block choices %}
 <div class="filter-autocomplete">
     <select
-        name="{{ spec.lookup_kwarg }}"
-        id="id_{{ spec.lookup_kwarg }}"
-        class="admin-autocomplete"
-        style="width:90%;"
-        data-ajax--url="{{ spec.autocomplete_url }}"
-        data-app-label="{{ spec.app_label }}"
-        data-model-name="{{ spec.model_name }}"
-        data-field-name="{{ spec.field_name }}"
-        data-allow-clear="true"
-        data-placeholder="{% blocktrans with label=spec.field_label %}Search by {{ label }}…{% endblocktrans %}">
+            name="{{ spec.lookup_kwarg }}"
+            id="id_{{ spec.lookup_kwarg }}"
+            class="admin-autocomplete"
+            style="width:90%;"
+            data-ajax--url="{{ spec.autocomplete_url }}"
+            data-app-label="{{ spec.app_label }}"
+            data-model-name="{{ spec.model_name }}"
+            data-field-name="{{ spec.field_name }}"
+            data-allow-clear="true"
+            data-placeholder="{% blocktrans with label=spec.field_label %}Search by {{ label }}…{% endblocktrans %}">
         {% if spec.lookup_val %}
         <option value="{{ spec.lookup_val }}" selected>{{ spec.initial_text }}</option>
         {% endif %}
     </select>
 </div>
+{% endblock %}
 
-<script>
-  (function($) {
-    $('.admin-autocomplete').djangoAdminSelect2();
-  })(django.jQuery);
-</script>
+{% block media %}
+{{ block.super }}
+<link rel="stylesheet"
+      href="{% static 'admin/css/vendor/select2/select2.css' %}"/>
+<link rel="stylesheet"
+      href="{% static 'admin/css/autocomplete.css' %}"/>
+
+<script src="{% static 'admin/js/vendor/select2/select2.full.js' %}"></script>
+<script src="{% static 'admin/js/autocomplete.js' %}"></script>
+{% endblock %}