diff --git a/apps/full-site-editing/full-site-editing-plugin/dotcom-fse/editor/style.scss b/apps/full-site-editing/full-site-editing-plugin/dotcom-fse/editor/style.scss
index af44e9ce59973..25fa7e011c037 100644
--- a/apps/full-site-editing/full-site-editing-plugin/dotcom-fse/editor/style.scss
+++ b/apps/full-site-editing/full-site-editing-plugin/dotcom-fse/editor/style.scss
@@ -43,7 +43,8 @@
 		padding-left: 0;
 		padding-right: 0;
 
-		.block-editor-block-list__block[data-align='full'] {
+		.block-editor-block-list__block[data-align='full'],
+		.wp-block[data-align='full'] { // Gutenberg >= 8.0.0
 			margin-left: 0;
 			margin-right: 0;
 		}
diff --git a/apps/full-site-editing/full-site-editing-plugin/dotcom-fse/plugins/close-button-override/style.scss b/apps/full-site-editing/full-site-editing-plugin/dotcom-fse/plugins/close-button-override/style.scss
index 93bd54205a21c..f94c3a7c92a25 100644
--- a/apps/full-site-editing/full-site-editing-plugin/dotcom-fse/plugins/close-button-override/style.scss
+++ b/apps/full-site-editing/full-site-editing-plugin/dotcom-fse/plugins/close-button-override/style.scss
@@ -53,6 +53,7 @@
 }
 
 // add an extra class specific for the new Gutenberg plugin version so the main override above stays compatible with < v7.7
+// includes additional `.interface-interface-skeleton__header` classes for compatibility with Gutenberg >= 8.0.0
 .post-type-wp_template_part
 	.block-editor-editor-skeleton__header
 	.edit-post-fullscreen-mode-close__toolbar__override,
@@ -61,6 +62,15 @@
 	.edit-post-fullscreen-mode-close__toolbar__override,
 .post-type-post
 	.block-editor-editor-skeleton__header
+	.edit-post-fullscreen-mode-close__toolbar__override,
+.post-type-wp_template_part
+	.interface-interface-skeleton__header
+	.edit-post-fullscreen-mode-close__toolbar__override,
+.post-type-page
+	.interface-interface-skeleton__header
+	.edit-post-fullscreen-mode-close__toolbar__override,
+.post-type-post
+	.interface-interface-skeleton__header
 	.edit-post-fullscreen-mode-close__toolbar__override {
 	// Close button override doesn't need the extraneous left-padding
 	// provided by .edit-post-header__toolbar from WP. So here we