diff --git a/netbox/templates/inc/table_header_filter_dropdown.html b/netbox/templates/inc/table_header_filter_dropdown.html
index 36665841f9d..e4292021240 100644
--- a/netbox/templates/inc/table_header_filter_dropdown.html
+++ b/netbox/templates/inc/table_header_filter_dropdown.html
@@ -1,6 +1,6 @@
 {% load form_helpers %}
 {% if form_field %}
-<div class="dropdown" style="display: inline;">
+<div class="column-filter dropdown">
     <a href="#" classs="btn dropdown-toggle" data-bs-toggle="dropdown" data-bs-auto-close="outside">
         <i class="mdi mdi-filter-settings" style="font-size: 1.25rem;"> </i>
     </a>
diff --git a/netbox/templates/inc/table_htmx.html b/netbox/templates/inc/table_htmx.html
index 6e9ebe874c9..0366207a334 100644
--- a/netbox/templates/inc/table_htmx.html
+++ b/netbox/templates/inc/table_htmx.html
@@ -17,17 +17,21 @@
                   ><i class="mdi mdi-close"></i></a>
                 </div>
               {% endif %}
+              {%  if table.filterset_form %}
+                {% include 'inc/table_header_filter_dropdown.html' with form_field=table.filterset_form|getfilterfield:column.name %}
+              {% endif %}
               <a href="#"
                  hx-get="{{ table.htmx_url }}{% querystring table.prefixed_order_by_field=column.order_by_alias.next %}"
                  hx-target="closest .htmx-container"
                  {% if not table.embedded %}hx-push-url="true"{% endif %}
               >{{ column.header }}</a>
-              {% include 'inc/table_header_filter_dropdown.html' with form_field=table.filterset_form|getfilterfield:column.name %}
             </th>
           {% else %}
             <th {{ column.attrs.th.as_html }}>
+              {%  if table.filterset_form %}
+                {% include 'inc/table_header_filter_dropdown.html' with form_field=table.filterset_form|getfilterfield:column.name %}
+              {% endif %}
               {{ column.header }}
-              {% include 'inc/table_header_filter_dropdown.html' with form_field=table.filterset_form|getfilterfield:column.name %}
             </th>
           {% endif %}
         {% endfor %}