diff --git a/plugins/catalog/src/components/CatalogTable/CatalogTable.test.tsx b/plugins/catalog/src/components/CatalogTable/CatalogTable.test.tsx
index 76a6c35b35..df796ff321 100644
--- a/plugins/catalog/src/components/CatalogTable/CatalogTable.test.tsx
+++ b/plugins/catalog/src/components/CatalogTable/CatalogTable.test.tsx
@@ -295,11 +295,15 @@ describe('CatalogTable component', () => {
   ])(
     'should render correct columns with kind filter $kind',
     async ({ kind, expectedColumns }) => {
+      const kindEntities = entities.map(e => ({
+        ...e,
+        kind: kind ?? e.kind,
+      }));
       await renderInTestApp(
         <ApiProvider apis={mockApis}>
           <MockEntityListContextProvider
             value={{
-              entities,
+              entities: kindEntities,
               filters: {
                 kind: kind
                   ? new EntityKindFilter(kind.toLocaleLowerCase('en-US'), kind)
diff --git a/plugins/catalog/src/components/CatalogTable/defaultCatalogTableColumnsFunc.tsx b/plugins/catalog/src/components/CatalogTable/defaultCatalogTableColumnsFunc.tsx
index ac4a8b1b69..fe2f9d19e4 100644
--- a/plugins/catalog/src/components/CatalogTable/defaultCatalogTableColumnsFunc.tsx
+++ b/plugins/catalog/src/components/CatalogTable/defaultCatalogTableColumnsFunc.tsx
@@ -25,18 +25,17 @@ export const defaultCatalogTableColumnsFunc: CatalogTableColumnsFunc = ({
   filters,
   entities,
 }) => {
-  // Derive the name column's defaultKind from the displayed entities so
-  // that the entity ref prefix stays consistent with the rows during
-  // filter transitions (when stale rows are kept visible while new data
-  // loads). The column layout switch still uses the filter's kind so the
-  // table shape updates immediately.
-  const defaultKind =
+  // Derive the effective kind from the displayed entities so that both
+  // the column layout and the name column's defaultKind stay consistent
+  // with the rows during filter transitions (when stale rows are kept
+  // visible while new data loads).
+  const effectiveKind =
     entities[0]?.kind?.toLocaleLowerCase('en-US') ?? filters.kind?.value;
   const showTypeColumn = filters.type === undefined;
 
   return [
     columnFactories.createTitleColumn({ hidden: true }),
-    columnFactories.createNameColumn({ defaultKind }),
+    columnFactories.createNameColumn({ defaultKind: effectiveKind }),
     ...createEntitySpecificColumns(),
   ];
 
@@ -51,7 +50,7 @@ export const defaultCatalogTableColumnsFunc: CatalogTableColumnsFunc = ({
       columnFactories.createSpecTypeColumn({ hidden: !showTypeColumn }),
       columnFactories.createSpecLifecycleColumn(),
     ];
-    switch (filters.kind?.value) {
+    switch (effectiveKind) {
       case 'user':
         return [...descriptionTagColumns];
       case 'domain':