diff --git a/editor/selectors.js b/editor/selectors.js
index 81ea4cf5f30a43..2c27b9e85fa2fc 100644
--- a/editor/selectors.js
+++ b/editor/selectors.js
@@ -453,15 +453,15 @@ export const getBlock = createSelector(
 		};
 	},
 	( state, uid ) => [
-		get( state, [ 'editor', 'blocksByUid', uid ] ),
-		get( state, 'editor.edits.meta' ),
+		get( state, [ 'editor', 'present', 'blocksByUid', uid ] ),
+		get( state, [ 'editor', 'present', 'edits', 'meta' ] ),
 		get( state, 'currentPost.meta' ),
 	]
 );
 
 function getPostMeta( state, key ) {
-	return has( state, [ 'editor', 'edits', 'meta', key ] ) ?
-		get( state, [ 'editor', 'edits', 'meta', key ] ) :
+	return has( state, [ 'editor', 'edits', 'present', 'meta', key ] ) ?
+		get( state, [ 'editor', 'edits', 'present', 'meta', key ] ) :
 		get( state, [ 'currentPost', 'meta', key ] );
 }