diff --git a/packages/app/src/components/catalog/EntityPage.tsx b/packages/app/src/components/catalog/EntityPage.tsx
index c2ae001060..155dc071ff 100644
--- a/packages/app/src/components/catalog/EntityPage.tsx
+++ b/packages/app/src/components/catalog/EntityPage.tsx
@@ -43,7 +43,6 @@ import {
 } from '@backstage/plugin-azure-devops';
 import { EntityBadgesDialog } from '@backstage/plugin-badges';
 import {
-  EntityContextMenuOptions,
   EntityAboutCard,
   EntityDependsOnComponentsCard,
   EntityDependsOnResourcesCard,
@@ -166,15 +165,13 @@ const EntityLayoutWrapper = (props: { children?: ReactNode }) => {
     ];
   }, []);
 
-  const options: EntityContextMenuOptions = {
-    disableUnregister: 'visible',
-  };
-
   return (
     <>
       <EntityLayout
         UNSTABLE_extraContextMenuItems={extraMenuItems}
-        UNSTABLE_contextMenuOptions={options}
+        UNSTABLE_contextMenuOptions={{
+          disableUnregister: 'visible',
+        }}
       >
         {props.children}
       </EntityLayout>
diff --git a/plugins/catalog/api-report.md b/plugins/catalog/api-report.md
index 0d2d611412..61dc503f2d 100644
--- a/plugins/catalog/api-report.md
+++ b/plugins/catalog/api-report.md
@@ -259,10 +259,10 @@ export interface EntityLayoutProps {
   children?: React_2.ReactNode;
   // (undocumented)
   NotFoundComponent?: React_2.ReactNode;
-  // Warning: (ae-forgotten-export) The symbol "contextMenuOptions" needs to be exported by the entry point index.d.ts
+  // Warning: (ae-forgotten-export) The symbol "EntityContextMenuOptions" needs to be exported by the entry point index.d.ts
   //
   // (undocumented)
-  UNSTABLE_contextMenuOptions?: contextMenuOptions;
+  UNSTABLE_contextMenuOptions?: EntityContextMenuOptions;
   // Warning: (ae-forgotten-export) The symbol "ExtraContextMenuItem" needs to be exported by the entry point index.d.ts
   //
   // (undocumented)
diff --git a/plugins/catalog/src/components/EntityLayout/EntityLayout.tsx b/plugins/catalog/src/components/EntityLayout/EntityLayout.tsx
index 5d82b5ccab..2295034905 100644
--- a/plugins/catalog/src/components/EntityLayout/EntityLayout.tsx
+++ b/plugins/catalog/src/components/EntityLayout/EntityLayout.tsx
@@ -144,8 +144,9 @@ interface ExtraContextMenuItem {
 
 type VisibleType = 'visible' | 'hidden' | 'disable';
 
+// NOTE(blam): Intentionally not exported at this point, since it's part of
 // unstable context menu option, eg: disable the unregister entity menu
-export interface EntityContextMenuOptions {
+interface EntityContextMenuOptions {
   disableUnregister: boolean | VisibleType;
 }
 
diff --git a/plugins/catalog/src/components/EntityLayout/index.ts b/plugins/catalog/src/components/EntityLayout/index.ts
index 73a58dfddc..251d213637 100644
--- a/plugins/catalog/src/components/EntityLayout/index.ts
+++ b/plugins/catalog/src/components/EntityLayout/index.ts
@@ -15,8 +15,4 @@
  */
 
 export { EntityLayout } from './EntityLayout';
-export type {
-  EntityLayoutProps,
-  EntityLayoutRouteProps,
-  EntityContextMenuOptions,
-} from './EntityLayout';
+export type { EntityLayoutProps, EntityLayoutRouteProps } from './EntityLayout';