diff --git a/netbox/project-static/netbox.scss b/netbox/project-static/netbox.scss
index dda69e76d..5b41ad2bb 100644
--- a/netbox/project-static/netbox.scss
+++ b/netbox/project-static/netbox.scss
@@ -186,6 +186,9 @@ pre {
   .card-header + .card-body {
     padding-top: 0;
   }
+  .card-body {
+    overflow-x: auto;
+  }
 }
 
 .form-floating {
diff --git a/netbox/templates/generic/object_bulk_edit.html b/netbox/templates/generic/object_bulk_edit.html
index 1aba4da7a..0f48c0d25 100644
--- a/netbox/templates/generic/object_bulk_edit.html
+++ b/netbox/templates/generic/object_bulk_edit.html
@@ -13,10 +13,12 @@
     {% for field in form.hidden_fields %}
         {{ field }}
     {% endfor %}
-    <div class="row">
+    <div class="row mb-3">
         <div class="col-md-8">
             <div class="card">
-                {% include 'inc/table.html' %}
+                <div class="card-body">
+                    {% include 'inc/table.html' %}
+                </div>
             </div>
         </div>
         <div class="col-md-4">
@@ -31,13 +33,12 @@
                         {% endif %}
                     {% endfor %}
                 </div>
-            </div>
-		    <div class="form-group text-end">
-                <div class="col-md-12">
+                <div class="card-footer text-end">
                     <a href="{{ return_url }}" class="btn btn-outline-danger">Cancel</a>
                     <button type="submit" name="_apply" class="btn btn-primary">Apply</button>
                 </div>
-		    </div>
+            </div>
+		    
         </div>
     </div>
 </form>