diff --git a/packages/base-styles/_mixins.scss b/packages/base-styles/_mixins.scss
index 29639668163b3..427b36201aef5 100644
--- a/packages/base-styles/_mixins.scss
+++ b/packages/base-styles/_mixins.scss
@@ -279,7 +279,7 @@
 			left: $admin-sidebar-width-collapsed;
 		}
 
-		@include break-large() {
+		@media (min-width: #{ ($break-large + 1) }) {
 			left: $admin-sidebar-width;
 		}
 	}
diff --git a/packages/e2e-tests/specs/editor/plugins/container-blocks.test.js b/packages/e2e-tests/specs/editor/plugins/container-blocks.test.js
index 4afa4273f373f..8350d0a499fb8 100644
--- a/packages/e2e-tests/specs/editor/plugins/container-blocks.test.js
+++ b/packages/e2e-tests/specs/editor/plugins/container-blocks.test.js
@@ -8,6 +8,7 @@ import {
 	getEditedPostContent,
 	insertBlock,
 	switchEditorModeTo,
+	pressKeyWithModifier,
 } from '@wordpress/e2e-test-utils';
 
 describe( 'InnerBlocks Template Sync', () => {
@@ -37,6 +38,8 @@ describe( 'InnerBlocks Template Sync', () => {
 		}, paragraphToAdd, blockSlug );
 		// Press "Enter" inside the Code Editor to fire the `onChange` event for the new value.
 		await page.click( '.editor-post-text-editor' );
+		await pressKeyWithModifier( 'primary', 'A' );
+		await page.keyboard.press( 'ArrowRight' );
 		await page.keyboard.press( 'Enter' );
 		await switchEditorModeTo( 'Visual' );
 	};