diff --git a/core-blocks/freeform/edit.js b/core-blocks/freeform/edit.js
index 470cd74b10c5f..0c0563ed40ab7 100644
--- a/core-blocks/freeform/edit.js
+++ b/core-blocks/freeform/edit.js
@@ -173,7 +173,7 @@ export default class FreeformEdit extends Component {
 			<div
 				key="editor"
 				id={ `editor-${ id }` }
-				className="wp-block-freeform blocks-rich-text__tinymce"
+				className="wp-block-freeform core-blocks-rich-text__tinymce"
 			/>,
 		];
 		/* eslint-enable jsx-a11y/no-static-element-interactions */
diff --git a/core-blocks/freeform/editor.scss b/core-blocks/freeform/editor.scss
index 2a3a35ffecc51..af9b9f356fd61 100644
--- a/core-blocks/freeform/editor.scss
+++ b/core-blocks/freeform/editor.scss
@@ -1,4 +1,4 @@
-.wp-block-freeform.editor-rich-text__tinymce {
+.wp-block-freeform.core-blocks-rich-text__tinymce {
 	overflow: hidden;
 	margin: -4px;
 	padding: 4px;
diff --git a/core-blocks/freeform/test/__snapshots__/index.js.snap b/core-blocks/freeform/test/__snapshots__/index.js.snap
index 646e88583ca46..2edc461fe971f 100644
--- a/core-blocks/freeform/test/__snapshots__/index.js.snap
+++ b/core-blocks/freeform/test/__snapshots__/index.js.snap
@@ -8,7 +8,7 @@ Array [
     id="toolbar-undefined"
   />,
   <div
-    class="wp-block-freeform blocks-rich-text__tinymce"
+    class="wp-block-freeform core-blocks-rich-text__tinymce"
     id="editor-undefined"
   />,
 ]