diff --git a/edit-post/index.js b/edit-post/index.js
index 19cfe5d6b024f..8858c482c037a 100644
--- a/edit-post/index.js
+++ b/edit-post/index.js
@@ -6,6 +6,8 @@ import { get, isString, some } from 'lodash';
 /**
  * WordPress dependencies
  */
+import { registerCoreBlocks } from '@wordpress/core-blocks';
+import domReady from '@wordpress/dom-ready';
 import { render, unmountComponentAtNode } from '@wordpress/element';
 import { deprecated } from '@wordpress/utils';
 
@@ -59,9 +61,6 @@ export function reinitializeEditor( target, settings ) {
  * @return {Object} Editor interface.
  */
 export function initializeEditor( id, post, settings ) {
-	const target = document.getElementById( id );
-	const reboot = reinitializeEditor.bind( null, target, settings );
-
 	if ( 'production' !== process.env.NODE_ENV ) {
 		// Remove with 3.0 release.
 		window.console.info(
@@ -84,16 +83,25 @@ export function initializeEditor( id, post, settings ) {
 		);
 	}
 
-	render(
-		<Editor settings={ migratedSettings || settings } onError={ reboot } post={ post } />,
-		target
-	);
+	return new Promise( ( resolve ) => {
+		domReady( () => {
+			const target = document.getElementById( id );
+			const reboot = reinitializeEditor.bind( null, target, settings );
+
+			registerCoreBlocks();
+
+			render(
+				<Editor settings={ migratedSettings || settings } onError={ reboot } post={ post } />,
+				target
+			);
 
-	return {
-		initializeMetaBoxes( metaBoxes ) {
-			store.dispatch( initializeMetaBoxState( metaBoxes ) );
-		},
-	};
+			resolve( {
+				initializeMetaBoxes( metaBoxes ) {
+					store.dispatch( initializeMetaBoxState( metaBoxes ) );
+				},
+			} );
+		} );
+	} );
 }
 
 export { default as PluginSidebar } from './components/sidebar/plugin-sidebar';
diff --git a/lib/client-assets.php b/lib/client-assets.php
index 1e4732d1431a9..d8e29e9272d9e 100644
--- a/lib/client-assets.php
+++ b/lib/client-assets.php
@@ -979,8 +979,9 @@ function gutenberg_editor_scripts_and_styles( $hook ) {
 	$script  = '( function() {';
 	$script .= sprintf( 'var editorSettings = %s;', wp_json_encode( $editor_settings ) );
 	$script .= <<<JS
-		window._wpLoadGutenbergEditor = wp.api.init().then( function() {
-			wp.coreBlocks.registerCoreBlocks();
+		window._wpLoadGutenbergEditor = new Promise( function( resolve ) {
+			wp.api.init().then( resolve );
+		} ).then( function() {
 			return wp.editPost.initializeEditor( 'editor', window._wpGutenbergPost, editorSettings );
 		} );
 JS;
diff --git a/package-lock.json b/package-lock.json
index 868df2f4af7cd..20326c909b8b7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -259,7 +259,7 @@
 			"resolved": "https://registry.npmjs.org/@wordpress/a11y/-/a11y-1.0.6.tgz",
 			"integrity": "sha512-IyL7KzYGzMEg+FFyTrQzD/CUfABYCXOvmnm29vBZBA3JMER1ep3/+NFDe6CpWVEEMCw94oj2gUOSQ4YKVgDjUQ==",
 			"requires": {
-				"@wordpress/dom-ready": "1.0.3"
+				"@wordpress/dom-ready": "1.0.4"
 			}
 		},
 		"@wordpress/autop": {
@@ -324,9 +324,9 @@
 			}
 		},
 		"@wordpress/dom-ready": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/@wordpress/dom-ready/-/dom-ready-1.0.3.tgz",
-			"integrity": "sha512-1tmJLO2NDc45wxnUWv6F/4q8/00qSgqLvBXBKl7IayLvJbG25vt7lMQkdSfiY2gTwsujAqOgOuJdO5VOGuqQNg=="
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/@wordpress/dom-ready/-/dom-ready-1.0.4.tgz",
+			"integrity": "sha512-FxSH0A23Xs0t/ZcvfiQly7P1V3pKsHQGjja+oISKV2NosfIcWjc3JTDFZYLcKjmSREozKqMoqVIPY+h1CP2ehw=="
 		},
 		"@wordpress/hooks": {
 			"version": "1.1.6",
diff --git a/package.json b/package.json
index 59c3a654f6bd9..2caa2d00a5302 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
 	"dependencies": {
 		"@wordpress/a11y": "1.0.6",
 		"@wordpress/autop": "1.0.4",
+		"@wordpress/dom-ready": "1.0.4",
 		"@wordpress/hooks": "1.1.6",
 		"@wordpress/i18n": "1.1.0",
 		"@wordpress/url": "1.0.3",