diff --git a/client/res/templates/modals/mass-update.tpl b/client/res/templates/modals/mass-update.tpl
index 94b12cde70..effdb9e651 100644
--- a/client/res/templates/modals/mass-update.tpl
+++ b/client/res/templates/modals/mass-update.tpl
@@ -1,5 +1,5 @@
 <div class="panel panel-default no-side-margin">
-<div class="panel-body">
+<div class="panel-body panel-body-form">
 
 {{#unless fieldList}}
     {{translate 'No fields available for Mass Update'}}
diff --git a/frontend/less/espo/elements/panel.less b/frontend/less/espo/elements/panel.less
index 2894455d45..46d8cac313 100644
--- a/frontend/less/espo/elements/panel.less
+++ b/frontend/less/espo/elements/panel.less
@@ -28,6 +28,10 @@
 
 .panel > .panel-body.panel-body-form {
     padding-bottom: @panel-padding - @form-group-margin-bottom;
+
+    > .button-container {
+        padding-bottom: 12px;
+    }
 }
 
 .panel-body > .no-margin {