diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/toggle/property-editor-ui-toggle.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/toggle/property-editor-ui-toggle.element.ts
index 1782bcc87f..ebb7f464fe 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/toggle/property-editor-ui-toggle.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/toggle/property-editor-ui-toggle.element.ts
@@ -1,8 +1,9 @@
 import type { UmbInputToggleElement } from '../../../components/input-toggle/input-toggle.element.js';
 import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
+import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import { UmbPropertyValueChangeEvent } from '@umbraco-cms/backoffice/property-editor';
 import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry';
-import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 
 /**
  * @element umb-property-editor-ui-toggle
@@ -28,9 +29,9 @@ export class UmbPropertyEditorUIToggleElement extends UmbLitElement implements U
 		this._showLabels = config?.getValueByAlias('showLabels');
 	}
 
-	private _onChange(event: CustomEvent) {
-		this.value = (event.target as UmbInputToggleElement).checked;
-		this.dispatchEvent(new CustomEvent('property-value-change'));
+	#onChange(event: CustomEvent & { target: UmbInputToggleElement }) {
+		this.value = event.target.checked;
+		this.dispatchEvent(new UmbPropertyValueChangeEvent());
 	}
 
 	render() {
@@ -39,7 +40,7 @@ export class UmbPropertyEditorUIToggleElement extends UmbLitElement implements U
 			.labelOn="${this._labelOn}"
 			.labelOff=${this._labelOff}
 			?showLabels="${this._showLabels}"
-			@change="${this._onChange}"></umb-input-toggle>`;
+			@change="${this.#onChange}"></umb-input-toggle>`;
 	}
 }