diff --git a/packages/js/email-editor/src/components/template-select/template-categories-list-sidebar.tsx b/packages/js/email-editor/src/components/template-select/template-categories-list-sidebar.tsx
index e789affd0a..0d9d3e0f6d 100644
--- a/packages/js/email-editor/src/components/template-select/template-categories-list-sidebar.tsx
+++ b/packages/js/email-editor/src/components/template-select/template-categories-list-sidebar.tsx
@@ -1,6 +1,4 @@
 import { Button } from '@wordpress/components';
-import { info } from '@wordpress/icons';
-import { __ } from '@wordpress/i18n';
 import { TemplateCategory } from '../../store';
 
 type Props = {
@@ -19,7 +17,6 @@ export function TemplateCategoriesListSidebar( {
 		<div className={ baseClassName }>
 			<div className={ `${ baseClassName }__categories-list` }>
 				{ templateCategories.map( ( { name, label } ) => {
-					const isRecentButton = name === 'recent';
 					return (
 						<Button
 							key={ name }
@@ -29,19 +26,6 @@ export function TemplateCategoriesListSidebar( {
 							onClick={ () => {
 								onClickCategory( name );
 							} }
-							showTooltip={ isRecentButton }
-							tooltipPosition="top"
-							aria-label="This is some content"
-							icon={ isRecentButton ? info : null }
-							iconPosition="right"
-							describedBy={
-								isRecentButton
-									? __(
-											'Templates created on the legacy editor will not appear here',
-											'mailpoet'
-									  )
-									: null
-							}
 						>
 							{ label }
 						</Button>
diff --git a/packages/js/email-editor/src/components/template-select/template-list.tsx b/packages/js/email-editor/src/components/template-select/template-list.tsx
index e62f513bb6..8ecabaa8f7 100644
--- a/packages/js/email-editor/src/components/template-select/template-list.tsx
+++ b/packages/js/email-editor/src/components/template-select/template-list.tsx
@@ -1,9 +1,11 @@
-import { useMemo } from '@wordpress/element';
+import { useMemo, memo } from '@wordpress/element';
 // @ts-expect-error No types available for this component
 import { BlockPreview } from '@wordpress/block-editor';
 import {
 	__experimentalHStack as HStack, // eslint-disable-line
+	Notice,
 } from '@wordpress/components';
+import { Icon, info, blockDefault } from '@wordpress/icons';
 import { __ } from '@wordpress/i18n';
 import { Async } from './async';
 import { TemplateCategory, TemplatePreview } from '../../store';
@@ -14,7 +16,32 @@ type Props = {
 	selectedCategory?: TemplateCategory;
 };
 
-function TemplateListBox( { templates, onTemplateSelection }: Props ) {
+function TemplateNoResults() {
+	return (
+		<div className="block-editor-inserter__no-results">
+			<Icon
+				className="block-editor-inserter__no-results-icon"
+				icon={ blockDefault }
+			/>
+			<p>{ __( 'No recent templates.' ) }</p>
+			<p>
+				{ __(
+					'Your recent creations will appear here as soon as you begin.'
+				) }
+			</p>
+		</div>
+	);
+}
+
+function TemplateListBox( {
+	templates,
+	onTemplateSelection,
+	selectedCategory,
+}: Props ) {
+	if ( selectedCategory === 'recent' && templates.length === 0 ) {
+		return <TemplateNoResults />;
+	}
+
 	return (
 		<div className="block-editor-block-patterns-list" role="listbox">
 			{ templates.map( ( template ) => (
@@ -66,6 +93,12 @@ function TemplateListBox( { templates, onTemplateSelection }: Props ) {
 	);
 }
 
+const compareProps = ( prev, next ) =>
+	prev.templates.length === next.templates.length &&
+	prev.selectedCategory === next.selectedCategory;
+
+const MemorizedTemplateListBox = memo( TemplateListBox, compareProps );
+
 export function TemplateList( {
 	templates,
 	onTemplateSelection,
@@ -81,9 +114,24 @@ export function TemplateList( {
 
 	return (
 		<div className="block-editor-block-patterns-explorer__list">
-			<TemplateListBox
+			{ selectedCategory === 'recent' && (
+				<Notice isDismissible={ false }>
+					<HStack spacing={ 1 } expanded={ false } justify="start">
+						<Icon icon={ info } />
+						<p>
+							{ __(
+								'Templates created on the legacy editor will not appear here.',
+								'mailpoet'
+							) }
+						</p>
+					</HStack>
+				</Notice>
+			) }
+
+			<MemorizedTemplateListBox
 				templates={ filteredTemplates }
 				onTemplateSelection={ onTemplateSelection }
+				selectedCategory={ selectedCategory }
 			/>
 		</div>
 	);
diff --git a/packages/js/email-editor/src/editor.tsx b/packages/js/email-editor/src/editor.tsx
index 52ceb8bdbb..222f283dd4 100644
--- a/packages/js/email-editor/src/editor.tsx
+++ b/packages/js/email-editor/src/editor.tsx
@@ -35,7 +35,7 @@ function Editor() {
 const WrappedEditor = applyFilters(
 	'mailpoet_email_editor_wrap_editor_component',
 	Editor
-);
+) as typeof Editor;
 
 export function initialize( elementId: string ) {
 	const container = document.getElementById( elementId );
@@ -47,6 +47,5 @@ export function initialize( elementId: string ) {
 	initBlocks();
 	initHooks();
 	const root = createRoot( container );
-	// @ts-ignore We don't have a type for WrappedEditor.
 	root.render( <WrappedEditor /> );
 }