diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/index.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/index.ts
index 49943aadb0..4a54461e21 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/index.ts
@@ -1,18 +1,8 @@
 import './components/index.js';
 
-export type { UmbAllowedMediaTypeModel } from './repository/index.js';
-export {
-	UmbMediaTypeItemRepository,
-	UMB_MEDIA_TYPE_ITEM_STORE_ALIAS,
-	UMB_MEDIA_TYPE_DETAIL_STORE_ALIAS,
-	UMB_MEDIA_TYPE_DETAIL_STORE_CONTEXT,
-	UmbMediaTypeStructureRepository,
-} from './repository/index.js';
-
-export {
-	UMB_MEDIA_TYPE_ROOT_ENTITY_TYPE,
-	UMB_MEDIA_TYPE_ENTITY_TYPE,
-	UMB_MEDIA_TYPE_FOLDER_ENTITY_TYPE,
-} from './entity.js';
-
 export * from './components/index.js';
+export * from './workspace/index.js';
+
+export * from './repository/index.js';
+export * from './tree/types.js';
+export * from './types.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/index.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/index.ts
new file mode 100644
index 0000000000..7ef9a8d8a1
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/index.ts
@@ -0,0 +1 @@
+export * from './media-type-workspace.context-token.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/media-type-workspace.context-token.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/media-type-workspace.context-token.ts
new file mode 100644
index 0000000000..c0e20a1550
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/media-type-workspace.context-token.ts
@@ -0,0 +1,12 @@
+import type { UmbMediaTypeWorkspaceContext } from './media-type-workspace.context.js';
+import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
+import type { UmbSaveableWorkspaceContextInterface } from '@umbraco-cms/backoffice/workspace';
+
+export const UMB_MEDIA_TYPE_WORKSPACE_CONTEXT = new UmbContextToken<
+	UmbSaveableWorkspaceContextInterface,
+	UmbMediaTypeWorkspaceContext
+>(
+	'UmbWorkspaceContext',
+	undefined,
+	(context): context is UmbMediaTypeWorkspaceContext => context.getEntityType?.() === 'media-type',
+);