From 7ca91e827f9b1c61b4cd8f65a9eab76adba6bad1 Mon Sep 17 00:00:00 2001
From: Sandor Karpf <sandor.karpf@lastpass.com>
Date: Sun, 11 Jan 2026 13:01:07 +0100
Subject: [PATCH] fix: header in EntityLayout should always be shown

Signed-off-by: Sandor Karpf <sandor.karpf@lastpass.com>
---
 .changeset/early-boxes-work.md                |  6 ++++++
 .../components/EntityLayout/EntityLayout.tsx  | 19 +++++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)
 create mode 100644 .changeset/early-boxes-work.md

diff --git a/.changeset/early-boxes-work.md b/.changeset/early-boxes-work.md
new file mode 100644
index 0000000000..11fc3ba134
--- /dev/null
+++ b/.changeset/early-boxes-work.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-catalog': patch
+---
+
+Header in EntityLayout should always be shown.
+Monitoring the loading status caused flickering when the refresh() method of the Async Entity was invoked.
diff --git a/plugins/catalog/src/alpha/components/EntityLayout/EntityLayout.tsx b/plugins/catalog/src/alpha/components/EntityLayout/EntityLayout.tsx
index 8f5838d545..750c8567ee 100644
--- a/plugins/catalog/src/alpha/components/EntityLayout/EntityLayout.tsx
+++ b/plugins/catalog/src/alpha/components/EntityLayout/EntityLayout.tsx
@@ -102,21 +102,13 @@ export const EntityLayout = (props: EntityLayoutProps) => {
     UNSTABLE_contextMenuOptions,
     contextMenuItems,
     children,
+    header,
     NotFoundComponent,
     parentEntityRelations,
   } = props;
   const { kind } = useRouteRefParams(entityRouteRef);
   const { entity, loading, error } = useAsyncEntity();
 
-  const header = props.header ?? (
-    <EntityHeader
-      parentEntityRelations={parentEntityRelations}
-      UNSTABLE_contextMenuOptions={UNSTABLE_contextMenuOptions}
-      UNSTABLE_extraContextMenuItems={UNSTABLE_extraContextMenuItems}
-      contextMenuItems={contextMenuItems}
-    />
-  );
-
   const routes = useElementFilter(
     children,
     elements =>
@@ -150,7 +142,14 @@ export const EntityLayout = (props: EntityLayoutProps) => {
 
   return (
     <Page themeId={entity?.spec?.type?.toString() ?? 'home'}>
-      {!loading && header}
+      {header ?? (
+        <EntityHeader
+          parentEntityRelations={parentEntityRelations}
+          UNSTABLE_contextMenuOptions={UNSTABLE_contextMenuOptions}
+          UNSTABLE_extraContextMenuItems={UNSTABLE_extraContextMenuItems}
+          contextMenuItems={contextMenuItems}
+        />
+      )}
 
       {loading && <Progress />}