diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts
index 9eef7e8806..f5f0c44dd2 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts
@@ -22,22 +22,18 @@ export class UmbPropertyEditorUIPickerModalElement extends UmbModalBaseElement<
 	@state()
 	private _propertyEditorUIs: Array<ManifestPropertyEditorUi> = [];
 
-	@state()
-	private _selection: Array<string> = [];
-
 	@state()
 	private _submitLabel = 'Select';
 
 	connectedCallback(): void {
 		super.connectedCallback();
 
-		this._selection = this._value?.selection ?? [];
 		this._submitLabel = this.data?.submitLabel ?? this._submitLabel;
 
-		this._usePropertyEditorUIs();
+		this.#usePropertyEditorUIs();
 	}
 
-	private _usePropertyEditorUIs() {
+	#usePropertyEditorUIs() {
 		if (!this.data) return;
 
 		this.observe(umbExtensionsRegistry.extensionsOfType('propertyEditorUi'), (propertyEditorUIs) => {
@@ -56,15 +52,15 @@ export class UmbPropertyEditorUIPickerModalElement extends UmbModalBaseElement<
 		});
 	}
 
-	private _handleClick(propertyEditorUi: ManifestPropertyEditorUi) {
-		this._select(propertyEditorUi.alias);
+	#handleClick(propertyEditorUi: ManifestPropertyEditorUi) {
+		this.#select(propertyEditorUi.alias);
 	}
 
-	private _select(alias: string) {
-		this._selection = [alias];
+	#select(alias: string) {
+		this._value = { selection: [alias] };
 	}
 
-	private _handleFilterInput(event: UUIInputEvent) {
+	#handleFilterInput(event: UUIInputEvent) {
 		let query = (event.target.value as string) || '';
 		query = query.toLowerCase();
 
@@ -105,7 +101,7 @@ export class UmbPropertyEditorUIPickerModalElement extends UmbModalBaseElement<
 		return html` <uui-input
 			type="search"
 			id="filter"
-			@input="${this._handleFilterInput}"
+			@input="${this.#handleFilterInput}"
 			placeholder="Type to filter..."
 			label="Type to filter icons">
 			<uui-icon name="search" slot="prepend" id="filter-icon"></uui-icon>
@@ -126,8 +122,8 @@ export class UmbPropertyEditorUIPickerModalElement extends UmbModalBaseElement<
 				groupItems,
 				(propertyEditorUI) => propertyEditorUI.alias,
 				(propertyEditorUI) =>
-					html` <li class="item" ?selected=${this._selection.includes(propertyEditorUI.alias)}>
-						<button type="button" @click="${() => this._handleClick(propertyEditorUI)}">
+					html` <li class="item" ?selected=${this._value.selection.includes(propertyEditorUI.alias)}>
+						<button type="button" @click="${() => this.#handleClick(propertyEditorUI)}">
 							<uui-icon name="${propertyEditorUI.meta.icon}" class="icon"></uui-icon>
 							${propertyEditorUI.meta.label || propertyEditorUI.name}
 						</button>
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/views/details/data-type-details-workspace-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/views/details/data-type-details-workspace-view.element.ts
index c80154e980..32a3413883 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/views/details/data-type-details-workspace-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/views/details/data-type-details-workspace-view.element.ts
@@ -77,6 +77,7 @@ export class UmbDataTypeDetailsWorkspaceViewEditElement extends UmbLitElement im
 		});
 
 		modalContext?.onSubmit().then((value) => {
+			console.log('got', value);
 			this._workspaceContext?.setPropertyEditorUiAlias(value?.selection[0]);
 		});
 	}