diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html
index 272c1598e..8c0eb0b22 100644
--- a/netbox/templates/generic/object_list.html
+++ b/netbox/templates/generic/object_list.html
@@ -67,6 +67,9 @@ Context:
         {% applied_filters filter_form request.GET %}
       {% endif %}
 
+      {# Object table controls #}
+      {% include 'inc/table_controls_htmx.html' with table_modal="ObjectTable_config" %}
+
       <form method="post" class="form form-horizontal">
         {% csrf_token %}
         {# "Select all" form #}
@@ -93,9 +96,6 @@ Context:
           </div>
         {% endif %}
 
-        {# Object table controls #}
-        {% include 'inc/table_controls_htmx.html' with table_modal="ObjectTable_config" %}
-
         <div class="form form-horizontal">
           {% csrf_token %}
           <input type="hidden" name="return_url" value="{% if return_url %}{{ return_url }}{% else %}{{ request.path }}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}{% endif %}" />