diff --git a/packages/edit-site/src/components/app/index.js b/packages/edit-site/src/components/app/index.js
index 6e98129d74d95..86e0f1fb3552d 100644
--- a/packages/edit-site/src/components/app/index.js
+++ b/packages/edit-site/src/components/app/index.js
@@ -39,7 +39,10 @@ export default function EditSiteApp( { reboot, homeTemplate } ) {
 			<Routes>
 				{ ( { params } ) => {
 					const isListPage = getIsListPage( params );
+
+					// The existence of `'front-page` supersedes very other settings.
 					const homeTemplateType =
+						params.postId?.includes( 'front-page' ) ||
 						params.postId === homeTemplate?.postId
 							? 'site-editor'
 							: undefined;