diff --git a/plugins/catalog/src/alpha/components/EntityHeader/EntityHeader.tsx b/plugins/catalog/src/alpha/components/EntityHeader/EntityHeader.tsx
index 6278bf9590..543da69099 100644
--- a/plugins/catalog/src/alpha/components/EntityHeader/EntityHeader.tsx
+++ b/plugins/catalog/src/alpha/components/EntityHeader/EntityHeader.tsx
@@ -108,6 +108,7 @@ function EntityHeaderSubtitle(props: { parentEntityRelations?: string[] }) {
const classes = useStyles();
const { entity } = useAsyncEntity();
const { name } = useRouteRefParams(entityRouteRef);
+ const entityName = entity?.metadata.title ?? name;
const parentEntity = findParentRelation(
entity?.relations ?? [],
parentEntityRelations ?? [],
@@ -131,7 +132,7 @@ function EntityHeaderSubtitle(props: { parentEntityRelations?: string[] }) {
)}
- {name}
+ {entityName}
) : null;
}
@@ -232,6 +233,7 @@ export function EntityHeader(props: {
);
const inspectDialogOpen = typeof selectedInspectEntityDialogTab === 'string';
+ const customTitle = typeof title === 'string' ? undefined : title;
const headerSubtitle = subtitle ?? (
);
@@ -256,11 +258,12 @@ export function EntityHeader(props: {
) : undefined
}
/>
- {(headerSubtitle || entity) && (
+ {(customTitle || headerSubtitle || entity) && (
+ {customTitle}
{headerSubtitle}
{entity && (
-
+
)}