diff --git a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
index f3ccd1d440..74582d0762 100644
--- a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
+++ b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
@@ -167,8 +167,7 @@ export const ScaffolderPageContents = () => {
               </Typography>
             )}
             {error && (
-              <WarningPanel>
-                Oops! Something went wrong loading the templates:{' '}
+              <WarningPanel title="Oops! Something went wrong loading the templates">
                 {error.message}
               </WarningPanel>
             )}
diff --git a/plugins/scaffolder/src/hooks/useStarredEntities.test.tsx b/plugins/scaffolder/src/hooks/useStarredEntities.test.tsx
index 78d2c4a58f..f1a8df1f32 100644
--- a/plugins/scaffolder/src/hooks/useStarredEntities.test.tsx
+++ b/plugins/scaffolder/src/hooks/useStarredEntities.test.tsx
@@ -65,7 +65,7 @@ describe('useStarredEntities', () => {
 
     expect(result.current.starredEntities.size).toBe(0);
   });
-  it('should return a set with the current items when there is items in storage', async () => {
+  it('should return a set with the current items when there are items in storage', async () => {
     const expectedIds = ['i', 'am', 'some', 'test', 'ids'];
     const store = mockStorage?.forBucket('settings');
     await store?.set('starredEntities', expectedIds);
@@ -95,7 +95,7 @@ describe('useStarredEntities', () => {
     expect(result.current.isStarredEntity(mockEntity)).toBeTruthy();
   });
 
-  it('should write new entries to the local store when adding a togglging entity', async () => {
+  it('should write new entries to the local store when adding a toggling entity', async () => {
     const { result } = renderHook(() => useStarredEntities(), { wrapper });
 
     act(() => {