diff --git a/assets/css/src/components-form-editor/_block-editor.scss b/assets/css/src/components-form-editor/_block-editor.scss
index ea57219207..2e9017e599 100644
--- a/assets/css/src/components-form-editor/_block-editor.scss
+++ b/assets/css/src/components-form-editor/_block-editor.scss
@@ -52,7 +52,7 @@ h2 {
 }
 
 // Fix for form padding rendering
-.block-editor-block-list__layout .block-editor-block-list__block:first-child {
+.mailpoet-form-background > div > .block-editor-block-list__layout > .block-editor-block-list__block:first-child {
   margin-top: 0;
 }
 
diff --git a/assets/js/src/form_editor/components/form_styling_background.jsx b/assets/js/src/form_editor/components/form_styling_background.jsx
index 3573cb8edb..9183c6577e 100644
--- a/assets/js/src/form_editor/components/form_styling_background.jsx
+++ b/assets/js/src/form_editor/components/form_styling_background.jsx
@@ -47,6 +47,7 @@ const FormStylingBackground = ({ children }) => {
   }
   return (
     <div
+      className="mailpoet-form-background"
       style={{
         backgroundColor,
         color: fontColor,