diff --git a/docs/release-notes/version-2.11.md b/docs/release-notes/version-2.11.md
index 0e7bad118..569ea4942 100644
--- a/docs/release-notes/version-2.11.md
+++ b/docs/release-notes/version-2.11.md
@@ -28,6 +28,7 @@
 * [#6124](https://github.com/netbox-community/netbox/issues/6124) - Location `parent` filter should return all child locations (not just those directly assigned)
 * [#6130](https://github.com/netbox-community/netbox/issues/6130) - Improve display of assigned models in custom fields list
 * [#6155](https://github.com/netbox-community/netbox/issues/6155) - Fix admin links for plugins, background tasks
+* [#6171](https://github.com/netbox-community/netbox/issues/6171) - Fix display of horizontally-scrolling object lists
 
 ---
 
diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html
index b3b9944bb..441589d27 100644
--- a/netbox/templates/generic/object_list.html
+++ b/netbox/templates/generic/object_list.html
@@ -29,7 +29,6 @@
                 {% block sidebar %}{% endblock %}
             </div>
         {% endif %}
-        <div class="table-responsive">
         {% with bulk_edit_url=content_type.model_class|validated_viewname:"bulk_edit" bulk_delete_url=content_type.model_class|validated_viewname:"bulk_delete" %}
             {% if permissions.change or permissions.delete %}
                 <form method="post" class="form form-horizontal">
@@ -59,7 +58,9 @@
                             </div>
                         </div>
                     {% endif %}
-                    {% render_table table 'inc/table.html' %}
+                    <div class="table-responsive">
+                        {% render_table table 'inc/table.html' %}
+                    </div>
                     <div class="pull-left noprint">
                         {% block bulk_buttons %}{% endblock %}
                         {% if bulk_edit_url and permissions.change %}
@@ -78,7 +79,6 @@
                 {% render_table table 'inc/table.html' %}
             {% endif %}
         {% endwith %}
-        </div>
         {% include 'inc/paginator.html' with paginator=table.paginator page=table.page %}
         <div class="clearfix"></div>
     </div>