diff --git a/blocks/components/editable/index.js b/blocks/components/editable/index.js
index 2bd6a232058806..165161fe0c7a8b 100644
--- a/blocks/components/editable/index.js
+++ b/blocks/components/editable/index.js
@@ -228,7 +228,7 @@ export default class Editable extends wp.element.Component {
 		}
 
 		content = wp.element.renderToString( content );
-		this.editor.setContent( content );
+		this.editor.setContent( content, { format: 'raw' } );
 	}
 
 	getContent() {
diff --git a/blocks/library/heading/index.js b/blocks/library/heading/index.js
index a6796c9678fa31..0b121478265eac 100644
--- a/blocks/library/heading/index.js
+++ b/blocks/library/heading/index.js
@@ -42,7 +42,7 @@ registerBlock( 'core/heading', {
 							blockType: 'core/heading',
 							attributes: {
 								nodeName: 'H2',
-								content: content[ 0 ]
+								content: content[ 0 ].props.children
 							}
 						};
 						const blocks = [ heading ];