diff --git a/netbox/templates/utilities/obj_list.html b/netbox/templates/utilities/obj_list.html
index d35520313..e917819c6 100644
--- a/netbox/templates/utilities/obj_list.html
+++ b/netbox/templates/utilities/obj_list.html
@@ -17,7 +17,7 @@
 </div>
 <h1>{% block title %}{{ content_type.model_class|model_name_plural|bettertitle }}{% endblock %}</h1>
 <div class="row">
-    <div class="col-md-9">
+    <div class="col-md-{% if filter_form %}9{% else %}12{% endif %}">
         {% with bulk_edit_url=content_type.model_class|url_name:"bulk_edit" bulk_delete_url=content_type.model_class|url_name:"bulk_delete" %}
         {% if permissions.change or permissions.delete %}
             <form method="post" class="form form-horizontal">
@@ -69,11 +69,11 @@
         {% include 'inc/paginator.html' with paginator=table.paginator page=table.page %}
         <div class="clearfix"></div>
     </div>
-    <div class="col-md-3 noprint">
-        {% if filter_form %}
+    {% if filter_form %}
+        <div class="col-md-3 noprint">
             {% include 'inc/search_panel.html' %}
-        {% endif %}
-        {% block sidebar %}{% endblock %}
-    </div>
+            {% block sidebar %}{% endblock %}
+        </div>
+    {% endif %}
 </div>
 {% endblock %}