diff --git a/editor/modes/visual-editor/block-list.js b/editor/modes/visual-editor/block-list.js
index 4e2d63d18f04a4..dbab75312d92d5 100644
--- a/editor/modes/visual-editor/block-list.js
+++ b/editor/modes/visual-editor/block-list.js
@@ -79,7 +79,7 @@ class VisualEditorBlockList extends Component {
 		if ( nextProps.multiSelectedBlockUids && nextProps.multiSelectedBlockUids.length > 0 ) {
 			const extent = this.nodes[ nextProps.selectionEnd ];
 			if ( extent ) {
-				scrollIntoView( extent, extent.closest( '.editor-layout__editor' ), {
+				scrollIntoView( extent, extent.closest( '.editor-layout__content' ), {
 					onlyScrollIfNeeded: true,
 				} );
 			}
diff --git a/editor/modes/visual-editor/block.js b/editor/modes/visual-editor/block.js
index 588f8504f6ac43..5295121e6679b5 100644
--- a/editor/modes/visual-editor/block.js
+++ b/editor/modes/visual-editor/block.js
@@ -89,7 +89,7 @@ class VisualEditorBlock extends Component {
 		}
 
 		// Not Ideal, but it's the easiest way to get the scrollable container
-		this.editorLayout = document.querySelector( '.editor-layout__editor' );
+		this.editorLayout = document.querySelector( '.editor-layout__content' );
 	}
 
 	componentWillReceiveProps( newProps ) {