diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/property-settings/property-settings-modal.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/property-settings/property-settings-modal.context.ts
index 462fedad3e..942f03bad7 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/property-settings/property-settings-modal.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/property-settings/property-settings-modal.context.ts
@@ -1,19 +1,24 @@
 import { UmbWorkspaceContextInterface } from '@umbraco-cms/backoffice/workspace';
 import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
-import { UmbBaseController } from '@umbraco-cms/backoffice/class-api';
+import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
+
+export const UMB_PROPERTY_TYPE_WORKSPACE_ALIAS = 'Umb.Workspace.PropertyType';
 
 /**
  * This is a very simplified workspace context, just to serve one for the imitated property type workspace. (As its not a real workspace)
  */
-export class UmbPropertyTypeWorkspaceContext extends UmbBaseController implements UmbWorkspaceContextInterface {
+export class UmbPropertyTypeWorkspaceContext
+	extends UmbContextBase<UmbPropertyTypeWorkspaceContext>
+	implements UmbWorkspaceContextInterface
+{
 	constructor(host: UmbControllerHostElement) {
 		// TODO: We don't need a repo here, so maybe we should not require this of the UmbEditableWorkspaceContextBase
-		super(host, 'UmbWorkspaceContext');
+		super(host, UMB_PROPERTY_TYPE_WORKSPACE_CONTEXT);
 	}
 
 	get workspaceAlias() {
-		return 'UmbWorkspaceContext';
+		return UMB_PROPERTY_TYPE_WORKSPACE_ALIAS;
 	}
 
 	getEntityId() {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/property-settings/property-settings-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/property-settings/property-settings-modal.element.ts
index 09f62b17aa..819a91db8d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/property-settings/property-settings-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/property-settings/property-settings-modal.element.ts
@@ -1,4 +1,7 @@
-import { UmbPropertyTypeWorkspaceContext } from './property-settings-modal.context.js';
+import {
+	UMB_PROPERTY_TYPE_WORKSPACE_ALIAS,
+	UmbPropertyTypeWorkspaceContext,
+} from './property-settings-modal.context.js';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { UUIBooleanInputEvent, UUIInputEvent, UUISelectEvent } from '@umbraco-cms/backoffice/external/uui';
 import { PropertyValueMap, css, html, nothing, customElement, state } from '@umbraco-cms/backoffice/external/lit';
@@ -223,7 +226,7 @@ export class UmbPropertySettingsModalElement extends UmbModalBaseElement<
 		return html`
 			<uui-form>
 				<form @submit="${this.#onSubmit}">
-					<umb-workspace-editor alias="Umb.Workspace.PropertyType" headline="Property settings">
+					<umb-workspace-editor alias=${UMB_PROPERTY_TYPE_WORKSPACE_ALIAS} headline="Property settings">
 						<div id="content">
 							<uui-box>
 								<div class="container">