diff --git a/dojo/static/dojo/css/dojo.css b/dojo/static/dojo/css/dojo.css
index 16c473f858..e7c5d0a890 100644
--- a/dojo/static/dojo/css/dojo.css
+++ b/dojo/static/dojo/css/dojo.css
@@ -1289,6 +1289,8 @@ span.endpoint_product {
 .dojo-filter-set select[multiple],
 .dojo-filter-set select[multiple=multiple] {
     width: 100%;
+    /* override the fixed .form-control height, which would clip the list to a single option row */
+    height: auto;
     min-height: 2.125rem;
     max-height: 5rem;
     font-size: 0.8125rem;
diff --git a/dojo/templates/dojo/filter_js_snippet.html b/dojo/templates/dojo/filter_js_snippet.html
index f7910326f5..e50441295a 100644
--- a/dojo/templates/dojo/filter_js_snippet.html
+++ b/dojo/templates/dojo/filter_js_snippet.html
@@ -3,9 +3,16 @@
 <script type="application/javascript">
     $(function () {
         $(function () {
-            $('.similar-filters select[multiple]').not('[data-tagulous]').each(function () {
-                $(this).select2();
-            })
+            // Select2 is only available when a tagulous widget pulled it in via form.media,
+            // so leave the native multiselect in place when it is not loaded.
+            if ($.fn.select2) {
+                $('.dojo-filter-set select[multiple], .similar-filters select[multiple]')
+                    .not('[data-tagulous]')
+                    .not('.select2-hidden-accessible')
+                    .each(function () {
+                        $(this).select2();
+                    })
+            }
             $('input[data-tagulous]').each(function () {
                 Tagulous.select2($(this))
             })