diff --git a/packages/editor/src/components/sidebar/index.js b/packages/editor/src/components/sidebar/index.js
index 7a6a1d10282731..72e68b841868aa 100644
--- a/packages/editor/src/components/sidebar/index.js
+++ b/packages/editor/src/components/sidebar/index.js
@@ -112,9 +112,7 @@ const SidebarContent = ( {
 				<Tabs.TabPanel tabId={ sidebars.document } focusable={ false }>
 					<PostSummary onActionPerformed={ onActionPerformed } />
 					<PluginDocumentSettingPanel.Slot />
-					{ renderingMode !== 'post-only' && (
-						<TemplateContentPanel />
-					) }
+					<TemplateContentPanel />
 					<PostTransformPanel />
 					<PostTaxonomiesPanel />
 					<PageAttributesPanel />
diff --git a/packages/editor/src/components/sidebar/post-summary.js b/packages/editor/src/components/sidebar/post-summary.js
index 367d3e112478cb..7118616bc1038e 100644
--- a/packages/editor/src/components/sidebar/post-summary.js
+++ b/packages/editor/src/components/sidebar/post-summary.js
@@ -28,7 +28,6 @@ import BlogTitle from '../blog-title';
 import PostsPerPage from '../posts-per-page';
 import SiteDiscussion from '../site-discussion';
 import { store as editorStore } from '../../store';
-import TemplateAreas from '../template-areas';
 
 /**
  * Module Constants
@@ -82,7 +81,6 @@ export default function PostSummary( { onActionPerformed } ) {
 										<PostFormatPanel />
 										<PostStickyPanel />
 									</VStack>
-									<TemplateAreas />
 									{ fills }
 								</VStack>
 							) }
diff --git a/packages/editor/src/components/template-areas/index.js b/packages/editor/src/components/template-areas/index.js
deleted file mode 100644
index 0d3bbe42d02eed..00000000000000
--- a/packages/editor/src/components/template-areas/index.js
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useSelect, useDispatch } from '@wordpress/data';
-import {
-	Button,
-	__experimentalHeading as Heading,
-} from '@wordpress/components';
-
-import { store as blockEditorStore } from '@wordpress/block-editor';
-import { __ } from '@wordpress/i18n';
-
-/**
- * Internal dependencies
- */
-import { store as editorStore } from '../../store';
-import { unlock } from '../../lock-unlock';
-import { TEMPLATE_POST_TYPE } from '../../store/constants';
-
-function TemplateAreaItem( { area, clientId } ) {
-	const { selectBlock, toggleBlockHighlight } =
-		useDispatch( blockEditorStore );
-	const templatePartArea = useSelect(
-		( select ) => {
-			const defaultAreas =
-				select(
-					editorStore
-				).__experimentalGetDefaultTemplatePartAreas();
-
-			return defaultAreas.find(
-				( defaultArea ) => defaultArea.area === area
-			);
-		},
-		[ area ]
-	);
-
-	const highlightBlock = () => toggleBlockHighlight( clientId, true );
-	const cancelHighlightBlock = () => toggleBlockHighlight( clientId, false );
-
-	return (
-		<Button
-			className="editor-template-areas__item"
-			icon={ templatePartArea?.icon }
-			onMouseOver={ highlightBlock }
-			onMouseLeave={ cancelHighlightBlock }
-			onFocus={ highlightBlock }
-			onBlur={ cancelHighlightBlock }
-			onClick={ () => {
-				selectBlock( clientId );
-			} }
-		>
-			{ templatePartArea?.label }
-		</Button>
-	);
-}
-
-export default function TemplateAreas() {
-	const { isTemplate, templateParts } = useSelect( ( select ) => {
-		const _isTemplate =
-			select( editorStore ).getCurrentPostType() === TEMPLATE_POST_TYPE;
-
-		return {
-			isTemplate: _isTemplate,
-			templateParts:
-				_isTemplate &&
-				unlock(
-					select( editorStore )
-				).getCurrentTemplateTemplateParts(),
-		};
-	}, [] );
-
-	if ( ! isTemplate || ! templateParts.length ) {
-		return null;
-	}
-
-	return (
-		<section className="editor-template-areas">
-			<Heading level={ 3 } className="editor-template-areas__title">
-				{ __( 'Areas' ) }
-			</Heading>
-
-			<ul className="editor-template-areas__list">
-				{ templateParts.map( ( { templatePart, block } ) => (
-					<li key={ block.clientId }>
-						<TemplateAreaItem
-							area={ templatePart.area }
-							clientId={ block.clientId }
-						/>
-					</li>
-				) ) }
-			</ul>
-		</section>
-	);
-}
diff --git a/packages/editor/src/components/template-areas/style.scss b/packages/editor/src/components/template-areas/style.scss
deleted file mode 100644
index 4a0dcd748c2edf..00000000000000
--- a/packages/editor/src/components/template-areas/style.scss
+++ /dev/null
@@ -1,22 +0,0 @@
-.editor-template-areas {
-	&__list {
-		margin: 0;
-		> li {
-			margin: 0;
-		}
-	}
-
-	&__item {
-		width: 100%;
-
-		// Override the default padding.
-		&.components-button.has-icon {
-			padding: 0;
-		}
-	}
-}
-
-h3.components-heading.editor-template-areas__title {
-	font-weight: 500;
-	margin: 0 0 $grid-unit-10;
-}
diff --git a/packages/editor/src/components/template-content-panel/index.js b/packages/editor/src/components/template-content-panel/index.js
index e0f131f27feb5d..64e40dc05172bc 100644
--- a/packages/editor/src/components/template-content-panel/index.js
+++ b/packages/editor/src/components/template-content-panel/index.js
@@ -13,6 +13,8 @@ import { __ } from '@wordpress/i18n';
  * Internal dependencies
  */
 import { unlock } from '../../lock-unlock';
+import { TEMPLATE_POST_TYPE } from '../../store/constants';
+import { store as editorStore } from '../../store';
 
 const { BlockQuickNavigation } = unlock( blockEditorPrivateApis );
 
@@ -22,11 +24,25 @@ const PAGE_CONTENT_BLOCKS = [
 	'core/post-title',
 ];
 
-export default function TemplateContentPanel() {
-	const clientIds = useSelect( ( select ) => {
+const TEMPLATE_PART_BLOCK = 'core/template-part';
+
+export default function TemplateContentPanel( { renderingMode } ) {
+	const { clientIds, postType } = useSelect( ( select ) => {
 		const { getBlocksByName } = select( blockEditorStore );
-		return getBlocksByName( PAGE_CONTENT_BLOCKS );
+		const { getCurrentPostType } = select( editorStore );
+		const _postType = getCurrentPostType();
+		return {
+			postType: _postType,
+			clientIds: getBlocksByName(
+				TEMPLATE_POST_TYPE === _postType
+					? TEMPLATE_PART_BLOCK
+					: PAGE_CONTENT_BLOCKS
+			),
+		};
 	}, [] );
+	if ( renderingMode !== 'post-only' && postType !== TEMPLATE_POST_TYPE ) {
+		return null;
+	}
 
 	return (
 		<PanelBody title={ __( 'Content' ) }>
diff --git a/packages/editor/src/store/private-selectors.js b/packages/editor/src/store/private-selectors.js
index aa2af9172ff18f..9af43599f12b5e 100644
--- a/packages/editor/src/store/private-selectors.js
+++ b/packages/editor/src/store/private-selectors.js
@@ -19,8 +19,6 @@ import {
 	getRenderingMode,
 	__experimentalGetDefaultTemplatePartAreas,
 } from './selectors';
-import { TEMPLATE_PART_POST_TYPE } from './constants';
-import { getFilteredTemplatePartBlocks } from './utils/get-filtered-template-parts';
 
 const EMPTY_INSERTION_POINT = {
 	rootClientId: undefined,
@@ -112,26 +110,3 @@ export const getPostIcon = createRegistrySelector(
 		}
 	}
 );
-
-/**
- * Returns the template parts and their blocks for the current edited template.
- *
- * @param {Object} state Global application state.
- * @return {Array} Template parts and their blocks in an array.
- */
-export const getCurrentTemplateTemplateParts = createRegistrySelector(
-	( select ) => () => {
-		const templateParts = select( coreStore ).getEntityRecords(
-			'postType',
-			TEMPLATE_PART_POST_TYPE,
-			{ per_page: -1 }
-		);
-
-		const clientIds =
-			select( blockEditorStore ).getBlocksByName( 'core/template-part' );
-		const blocks =
-			select( blockEditorStore ).getBlocksByClientId( clientIds );
-
-		return getFilteredTemplatePartBlocks( blocks, templateParts );
-	}
-);
diff --git a/packages/editor/src/style.scss b/packages/editor/src/style.scss
index 21e1d20997fcce..d969f6b9614ec4 100644
--- a/packages/editor/src/style.scss
+++ b/packages/editor/src/style.scss
@@ -51,6 +51,5 @@
 @import "./components/sidebar/style.scss";
 @import "./components/site-discussion/style.scss";
 @import "./components/table-of-contents/style.scss";
-@import "./components/template-areas/style.scss";
 @import "./components/text-editor/style.scss";
 @import "./components/visual-editor/style.scss";