diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/components/input-tiptap/input-tiptap.element.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/components/input-tiptap/input-tiptap.element.ts
index 4541209e21..459e01e2ab 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/components/input-tiptap/input-tiptap.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/components/input-tiptap/input-tiptap.element.ts
@@ -179,7 +179,7 @@ export class UmbInputTiptapElement extends UmbFormControlMixin<string, typeof Um
 					</umb-tiptap-toolbar>
 				`,
 			)}
-			<div id="editor"></div>
+			<div id="editor" data-mark="input:tiptap-rte"></div>
 		`;
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/components/input-tiptap/tiptap-toolbar.element.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/components/input-tiptap/tiptap-toolbar.element.ts
index 6c66cc56bf..8338b7bf43 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/components/input-tiptap/tiptap-toolbar.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/components/input-tiptap/tiptap-toolbar.element.ts
@@ -30,6 +30,8 @@ export class UmbTiptapToolbarElement extends UmbLitElement {
 
 	override connectedCallback(): void {
 		super.connectedCallback();
+		this.setAttribute('data-mark', 'tiptap-toolbar');
+
 		this.#attached = true;
 		this.#observeExtensions();
 	}
@@ -51,7 +53,12 @@ export class UmbTiptapToolbarElement extends UmbLitElement {
 			[],
 			(manifest) => this.toolbar.flat(2).includes(manifest.alias),
 			(extensionControllers) => {
-				this._lookup = new Map(extensionControllers.map((ext) => [ext.alias, ext.component]));
+				this._lookup = new Map(
+					extensionControllers.map((ext) => {
+						(ext.component as HTMLElement)?.setAttribute('data-mark', `action:tiptap-toolbar:${ext.alias}`);
+						return [ext.alias, ext.component];
+					}),
+				);
 			},
 			undefined,
 			undefined,
diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/tiptap/components/property-editor-ui-tiptap-toolbar-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/tiptap/components/property-editor-ui-tiptap-toolbar-configuration.element.ts
index 46525299dc..159a040f77 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/tiptap/components/property-editor-ui-tiptap-toolbar-configuration.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/tiptap/components/property-editor-ui-tiptap-toolbar-configuration.element.ts
@@ -165,6 +165,7 @@ export class UmbPropertyEditorUiTiptapToolbarConfigurationElement
 			<uui-button
 				compact
 				class=${forbidden ? 'forbidden' : ''}
+				data-mark="tiptap-toolbar-item:${item.alias}"
 				draggable="true"
 				look=${forbidden ? 'placeholder' : 'outline'}
 				?disabled=${forbidden || inUse}
@@ -303,6 +304,7 @@ export class UmbPropertyEditorUiTiptapToolbarConfigurationElement
 					<uui-button
 						compact
 						class=${forbidden ? 'forbidden' : ''}
+						data-mark="tiptap-toolbar-item:${item.alias}"
 						draggable="true"
 						look=${forbidden ? 'placeholder' : 'outline'}
 						title=${this.localize.string(item.label)}