diff --git a/core-blocks/freeform/editor.scss b/core-blocks/freeform/editor.scss
index 56bf9a7aa52583..8921db6abe9e95 100644
--- a/core-blocks/freeform/editor.scss
+++ b/core-blocks/freeform/editor.scss
@@ -1,8 +1,4 @@
 .wp-block-freeform.core-blocks-rich-text__tinymce {
-	overflow: hidden;
-	margin: -4px;
-	padding: 4px;
-
 	p,
 	li {
 		line-height: $editor-line-height;
@@ -140,11 +136,10 @@ div[data-type="core/freeform"] .editor-block-contextual-toolbar + div {
 
 .freeform-toolbar {
 	width: auto;
-	margin: #{ -$block-padding } #{ -$parent-block-padding };
-	margin-bottom: $block-padding;
-	position: sticky;
+	margin: 0 #{ -$parent-block-padding };
+	position: relative;
 	z-index: z-index( '.freeform-toolbar' );
-	top: 0;
+	top: #{ -1 * $block-padding };
 }
 
 .freeform-toolbar:empty {