diff --git a/plugins/scaffolder/src/next/TemplateListPage/TemplateListPage.test.tsx b/plugins/scaffolder/src/next/TemplateListPage/TemplateListPage.test.tsx
index 3cc865b95c..1f6c60237c 100644
--- a/plugins/scaffolder/src/next/TemplateListPage/TemplateListPage.test.tsx
+++ b/plugins/scaffolder/src/next/TemplateListPage/TemplateListPage.test.tsx
@@ -71,7 +71,7 @@ describe('TemplateListPage', () => {
     expect(getByRole('menuitem', { name: 'Starred' })).toBeInTheDocument();
   });
 
-  it('should render the category picker', () => {
+  it('should render the category picker', async () => {
     const { getByText } = await renderInTestApp(
       <TestApiProvider
         apis={[
@@ -91,4 +91,38 @@ describe('TemplateListPage', () => {
 
     expect(getByText('Categories')).toBeInTheDocument();
   });
+
+  it('should render the EntityTag picker', async () => {
+    const { getByText } = await renderInTestApp(
+      <TestApiProvider
+        apis={[
+          [
+            catalogApiRef,
+            {
+              getEntities: async () => ({
+                items: [
+                  {
+                    apiVersion: 'scaffolder.backstage.io/v1beta3',
+                    kind: 'Template',
+                    metadata: { name: 'blob', tags: ['blob'] },
+                  },
+                ],
+              }),
+            },
+          ],
+          [
+            starredEntitiesApiRef,
+            new DefaultStarredEntitiesApi({
+              storageApi: MockStorageApi.create(),
+            }),
+          ],
+          [permissionApiRef, {}],
+        ]}
+      >
+        <TemplateListPage />
+      </TestApiProvider>,
+    );
+
+    expect(getByText('Tags')).toBeInTheDocument();
+  });
 });
diff --git a/plugins/scaffolder/src/next/TemplateListPage/TemplateListPage.tsx b/plugins/scaffolder/src/next/TemplateListPage/TemplateListPage.tsx
index 25441a6812..aab72f3cdf 100644
--- a/plugins/scaffolder/src/next/TemplateListPage/TemplateListPage.tsx
+++ b/plugins/scaffolder/src/next/TemplateListPage/TemplateListPage.tsx
@@ -21,7 +21,6 @@ import { makeStyles } from '@material-ui/core';
 import {
   Content,
   ContentHeader,
-  CreateButton,
   Header,
   Lifecycle,
   Page,