diff --git a/netbox/templates/htmx/object_selector.html b/netbox/templates/htmx/object_selector.html
index aded35fc5..eae027bea 100644
--- a/netbox/templates/htmx/object_selector.html
+++ b/netbox/templates/htmx/object_selector.html
@@ -6,19 +6,20 @@
 </div>
 <div class="modal-body row">
   <div class="col-3">
-    <ul class="nav nav-pills flex-column">
+    <div class="list-group">
       {% for field in form.visible_fields %}
-        <li class="nav-item">
-          <a class="nav-link" href="#" data-bs-toggle="collapse" data-bs-target="#selector{{ forloop.counter }}">{{ field.label }}</a>
-        </li>
+        <a href="#" class="list-group-item list-group-item-action px-2 py-1" data-bs-toggle="collapse" data-bs-target="#checkmark{{ forloop.counter }}, #selector{{ forloop.counter }}">
+          <span id="checkmark{{ forloop.counter }}" class="collapse{% if forloop.counter < 3 %} show{% endif %}"><i class="mdi mdi-check-bold"></i></span>
+          {{ field.label }}
+        </a>
       {% endfor %}
-    </ul>
+    </div>
   </div>
   <div class="col-9">
     <form hx-get="{% url 'htmx_object_selector' %}?_model={{ model|meta:"label_lower" }}" hx-target="#selector_results">
       <div class="tab-content p-1">
         {% for field in form.visible_fields %}
-          <div class="collapse{% if forloop.first %} show{% endif %}" id="selector{{ forloop.counter }}">{% render_field field %}</div>
+          <div class="collapse{% if forloop.counter < 3 %} show{% endif %}" id="selector{{ forloop.counter }}">{% render_field field %}</div>
         {% endfor %}
       </div>
       <div class="text-end">