diff --git a/projects/packages/forms/changelog/fix-form-field-widths b/projects/packages/forms/changelog/fix-form-field-widths
new file mode 100644
index 000000000000..55beb1ec9e48
--- /dev/null
+++ b/projects/packages/forms/changelog/fix-form-field-widths
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Forms: Fix field spacing and widths.
diff --git a/projects/packages/forms/src/blocks/contact-form/editor.scss b/projects/packages/forms/src/blocks/contact-form/editor.scss
index 9c6c49186d55..8be9bdbbdda2 100644
--- a/projects/packages/forms/src/blocks/contact-form/editor.scss
+++ b/projects/packages/forms/src/blocks/contact-form/editor.scss
@@ -41,7 +41,7 @@
 		}
 	}
 
-	.block-editor-inner-blocks > .block-editor-block-list__layout {
+	.block-editor-block-list__layout {
 		display: flex;
 		flex-wrap: wrap;
 		justify-content: flex-start;
@@ -577,17 +577,6 @@
 	}
 }
 
-// Overrides to make the preview look good
-.block-editor-inserter__preview {
-	.jetpack-contact-form {
-		padding: 16px;
-
-		.block-editor-inner-blocks .block-editor-block-list__layout {
-			margin: 0;
-		}
-	}
-}
-
 // Make sure form settings dropdown looks good on older Gutenberg versions
 .jetpack-contact-form__popover .components-popover__content {
 	min-width: 260px;
diff --git a/projects/plugins/jetpack/changelog/fix-form-field-widths b/projects/plugins/jetpack/changelog/fix-form-field-widths
new file mode 100644
index 000000000000..58a1edb2990e
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/fix-form-field-widths
@@ -0,0 +1,4 @@
+Significance: patch
+Type: bugfix
+
+Forms: Fix field spacing and widths.