diff --git a/packages/edit-site/src/components/add-new-template/add-custom-template-modal.js b/packages/edit-site/src/components/add-new-template/add-custom-template-modal.js
index e4da86799a2a81..06ee2c70dedda0 100644
--- a/packages/edit-site/src/components/add-new-template/add-custom-template-modal.js
+++ b/packages/edit-site/src/components/add-new-template/add-custom-template-modal.js
@@ -145,14 +145,20 @@ function SuggestionList( { entityForSuggestions, onSelect } ) {
debouncedSearch
);
const { labels } = entityForSuggestions;
+ const [ showSearchControl, setShowSearchControl ] = useState( false );
+ if ( ! showSearchControl && suggestions?.length > 9 ) {
+ setShowSearchControl( true );
+ }
return (
<>
-
+ { showSearchControl && (
+
+ ) }
{ !! suggestions?.length && (