diff --git a/src/blocks/blocks/form/edit.js b/src/blocks/blocks/form/edit.js
index 3a6ff7a42..0356c67bb 100644
--- a/src/blocks/blocks/form/edit.js
+++ b/src/blocks/blocks/form/edit.js
@@ -1052,9 +1052,8 @@ const Edit = ({
 											submitLabel = submitLabel.replace( /<br\s*\/?>/gi, ' ' );
 											setAttributes({ submitLabel });
 										} }
-										multiline={ false }
 										multiple={ false }
-										tagName="button"
+										tagName="span"
 										type='submit'
 										onClick={ e => e.preventDefault() }
 									/>
diff --git a/src/blocks/blocks/form/style.scss b/src/blocks/blocks/form/style.scss
index e98e3274a..f421a3bc9 100644
--- a/src/blocks/blocks/form/style.scss
+++ b/src/blocks/blocks/form/style.scss
@@ -69,6 +69,7 @@
 				border: 0px;
 				transition: background-color 0.15s linear;
 				max-width: max-content;
+				white-space: normal !important;
 
 				@media ( min-width:640px ) and ( max-width: 1024px ) {
 					padding: var(--btn-pad-tablet);