diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/property-editor-ui-picker-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/property-editor-ui-picker-modal.token.ts
index 7a96e4c8ce..bf682ced50 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/property-editor-ui-picker-modal.token.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/property-editor-ui-picker-modal.token.ts
@@ -1,8 +1,6 @@
 import { UmbModalToken } from './modal-token.js';
 
-export interface UmbPropertyEditorUIPickerModalData {
-	submitLabel?: string;
-}
+export interface UmbPropertyEditorUIPickerModalData {}
 
 export type UmbPropertyEditorUIPickerModalValue = {
 	selection: Array<string>;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts
index a8ea26c931..562edc2e85 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts
@@ -24,15 +24,9 @@ export class UmbPropertyEditorUIPickerModalElement extends UmbModalBaseElement<
 	@state()
 	private _propertyEditorUIs: Array<ManifestPropertyEditorUi> = [];
 
-	@state()
-	private _submitLabel = 'Select';
-
 	override connectedCallback(): void {
 		super.connectedCallback();
 
-		// TODO: We never parse on a submit label, so this seem weird as we don't enable this of other places.
-		//this._submitLabel = this.data?.submitLabel ?? this._submitLabel;
-
 		this.#usePropertyEditorUIs();
 	}
 
@@ -54,11 +48,8 @@ export class UmbPropertyEditorUIPickerModalElement extends UmbModalBaseElement<
 	}
 
 	#handleClick(propertyEditorUi: ManifestPropertyEditorUi) {
-		this.#select(propertyEditorUi.alias);
-	}
-
-	#select(alias: string) {
-		this.value = { selection: [alias] };
+		this.value = { selection: [propertyEditorUi.alias] };
+		this._submitModal();
 	}
 
 	#handleFilterInput(event: UUIInputEvent) {
@@ -87,12 +78,7 @@ export class UmbPropertyEditorUIPickerModalElement extends UmbModalBaseElement<
 			<umb-body-layout headline=${this.localize.term('propertyEditorPicker_openPropertyEditorPicker')}>
 				<uui-box> ${this._renderFilter()} ${this._renderGrid()} </uui-box>
 				<div slot="actions">
-					<uui-button label="Close" @click=${this._rejectModal}></uui-button>
-					<uui-button
-						label="${this._submitLabel}"
-						look="primary"
-						color="positive"
-						@click=${this._submitModal}></uui-button>
+					<uui-button label=${this.localize.term('general_close')} @click=${this._rejectModal}></uui-button>
 				</div>
 			</umb-body-layout>
 		`;