diff --git a/static/src/xml/website_form_editor.xml b/static/src/xml/website_form_editor.xml
index 195a50c5c60..55e3f6e940b 100644
--- a/static/src/xml/website_form_editor.xml
+++ b/static/src/xml/website_form_editor.xml
@@ -28,13 +28,13 @@
 
     <!-- Generic Field Layout -->
     <t t-name="website_form_editor.field">
-        <div t-att-class="'form-group form-field' + (field.custom ? ' o_website_form_custom' : '') + (field.required ? ' o_website_form_required' : '')">
-            <div class="col-lg-3 col-md-4 text-right-not-xs">
+        <div t-att-class="'row form-group form-field' + (field.custom ? ' o_website_form_custom' : '') + (field.required ? ' o_website_form_required' : '')">
+            <div class="col-md-4 text-right-not-xs">
                 <label class="col-form-label" t-att-for="field.name">
                     <t t-esc="field.string"/>
                 </label>
             </div>
-            <div class="col-lg-7 col-md-8">
+            <div class="col-md-8">
                 <t t-raw="0"/>
             </div>
         </div>
diff --git a/views/snippets.xml b/views/snippets.xml
index ccb64c80612..377a1afd5dd 100644
--- a/views/snippets.xml
+++ b/views/snippets.xml
@@ -3,10 +3,12 @@
 
         <template id="s_website_form" name="Form Builder">
             <form action="/website_form/" method="post" class="s_website_form container-fluid mt32" enctype="multipart/form-data">
-                <div class="form-group row">
-                    <div class="offset-lg-3 offset-md-4 col-md-8 col-lg-7">
-                        <button class="btn btn-primary btn-lg o_website_form_send">Send</button>
-                        <span id="o_website_form_result"></span>
+                <div class="container">
+                    <div class="form-group row">
+                        <div class="offset-lg-3 offset-md-4 col-md-8 col-lg-7">
+                            <button class="btn btn-primary btn-lg o_website_form_send">Send</button>
+                            <span id="o_website_form_result"></span>
+                        </div>
                     </div>
                 </div>
             </form>