diff --git a/src/Bundle/ChillEventBundle/Controller/EventListController.php b/src/Bundle/ChillEventBundle/Controller/EventListController.php
index dd1e26353..2aeff4b06 100644
--- a/src/Bundle/ChillEventBundle/Controller/EventListController.php
+++ b/src/Bundle/ChillEventBundle/Controller/EventListController.php
@@ -88,10 +88,14 @@ final class EventListController extends AbstractController
             ->addSearchBox(['name'])
             ->addEntityChoice('event_types', 'event.filter.event_types', EventType::class, $types, [
                 'choice_label' => fn (EventType $e) => $this->translatableStringHelper->localize($e->getName()),
+                'expanded' => false,
+                'attr' => ['class' => 'select2'],
             ])
             ->addUserPicker('responsables', 'event.filter.pick_responsable', ['multiple' => true, 'required' => false])
             ->addEntityChoice('centers', 'event.filter.center', Center::class, $centers, [
                 'choice_label' => fn (Center $c) => $c->getName(),
+                'expanded' => false,
+                'attr' => ['class' => 'select2'],
             ]);
 
         return $builder->build();
diff --git a/src/Bundle/ChillMainBundle/Resources/views/FilterOrder/base.html.twig b/src/Bundle/ChillMainBundle/Resources/views/FilterOrder/base.html.twig
index adf67b81b..adae5f4b7 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/FilterOrder/base.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/FilterOrder/base.html.twig
@@ -68,10 +68,17 @@
                                 {{ form_label(form.entity_choices[checkbox_name])}}
                             {% endif %}
                             <div class="col-sm-8 pt-2">
-                                {% for c in form['entity_choices'][checkbox_name].children %}
-                                    {{ form_widget(c) }}
-                                    {{ form_label(c) }}
-                                {% endfor %}
+                                {% set field = form['entity_choices'][checkbox_name] %}
+                                {% if field.vars.expanded %}
+                                    {# Render expanded checkboxes/radios #}
+                                    {% for c in field.children %}
+                                        {{ form_widget(c) }}
+                                        {{ form_label(c) }}
+                                    {% endfor %}
+                                {% else %}
+                                    {# Render select dropdown #}
+                                    {{ form_widget(field) }}
+                                {% endif %}
                             </div>
                         </div>
                     {% endfor %}