diff --git a/sapl/crispy_layout_mixin.py b/sapl/crispy_layout_mixin.py
index 8328b0b2a..9725412d0 100644
--- a/sapl/crispy_layout_mixin.py
+++ b/sapl/crispy_layout_mixin.py
@@ -50,7 +50,7 @@ def form_actions(more=[Div(css_class='clearfix')],
         Submit(name, label, css_class=css_class,
                # para impedir resubmissão do form
                onclick=doubleclick),
-        css_class='form-group row justify-content-between'
+        css_class='justify-content-between'
     )
 
 
diff --git a/sapl/templates/bootstrap4/layout/formactions.html b/sapl/templates/bootstrap4/layout/formactions.html
index 3ab247fbe..e99d14306 100644
--- a/sapl/templates/bootstrap4/layout/formactions.html
+++ b/sapl/templates/bootstrap4/layout/formactions.html
@@ -1,4 +1,4 @@
-<div{% if formactions.attrs %} {{ formactions.flat_attrs|safe }}{% endif %} class="form-group row">
+<div{% if formactions.attrs %} {{ formactions.flat_attrs|safe }}{% endif %} class="form-group{% if 'form-horizontal' in form_class %} row{% endif %} {{ formactions.css_class }}" {% if formactions.id %} id="{{ formactions.id }}"{% endif %}>
     {% if label_class %}
         <div class="aab {{ label_class }}"></div>
     {% endif %}