diff --git a/lib/helpers/ContentUiHelper.ts b/lib/helpers/ContentUiHelper.ts
index d9a2301..c4d650c 100644
--- a/lib/helpers/ContentUiHelper.ts
+++ b/lib/helpers/ContentUiHelper.ts
@@ -161,6 +161,7 @@ export class ContentUiHelper extends UiBaseLocators {
   private readonly confirmToPublishBtn: Locator;
   private readonly tiptapStatusbarWordCount: Locator;
   private readonly tiptapStatusbarElementPath: Locator;
+  private readonly createDocumentBlueprintBtn: Locator;
 
   constructor(page: Page) {
     super(page);
@@ -277,6 +278,7 @@ export class ContentUiHelper extends UiBaseLocators {
     this.linkToManualBtn = this.linkPickerModal.locator('[data-mark="action:external"] #button');
     this.umbDocumentCollection = page.locator('umb-document-collection');
     this.documentTableColumnName = this.listView.locator('umb-document-table-column-name');
+    this.createDocumentBlueprintBtn = page.locator('[data-mark="entity-action:Umb.EntityAction.Document.CreateBlueprint"]');
     //Block Grid - Block List
     this.addBlockElementBtn = page.locator('uui-button-group > uui-button').first().filter({has: page.locator('a#button')});
     this.formValidationMessage = page.locator('#splitViews umb-form-validation-message #messages');
@@ -415,6 +417,7 @@ export class ContentUiHelper extends UiBaseLocators {
   }
 
   async clickCreateDocumentBlueprintButton() {
+    await expect(this.createDocumentBlueprintBtn).toBeVisible();
     await this.createDocumentBlueprintBtn.click();
   }
 
diff --git a/lib/helpers/DocumentBlueprintUiHelper.ts b/lib/helpers/DocumentBlueprintUiHelper.ts
index ee70db4..2beff05 100644
--- a/lib/helpers/DocumentBlueprintUiHelper.ts
+++ b/lib/helpers/DocumentBlueprintUiHelper.ts
@@ -6,12 +6,14 @@ export class DocumentBlueprintUiHelper extends UiBaseLocators{
   private readonly documentBlueprintTree: Locator;
   private readonly documentBlueprintNameTxt: Locator;
   private readonly deleteMenu: Locator;
+  private readonly createDocumentBlueprintBtn: Locator;
 
   constructor(page: Page) {
     super(page);
     this.documentBlueprintTree = page.locator('umb-tree[alias="Umb.Tree.DocumentBlueprint"]');
     this.documentBlueprintNameTxt = page.locator('#name-input #input');
     this.deleteMenu = page.locator('umb-section-sidebar #menu-item').getByLabel('Delete');
+    this.createDocumentBlueprintBtn = page.locator('[data-mark="entity-action:Umb.EntityAction.DocumentBlueprint.Create"]');
   }
 
   async clickActionsMenuForDocumentBlueprints(name: string) {
@@ -44,6 +46,7 @@ export class DocumentBlueprintUiHelper extends UiBaseLocators{
   }
 
   async clickCreateDocumentBlueprintButton() {
+    await expect(this.createDocumentBlueprintBtn).toBeVisible();
     await this.createDocumentBlueprintBtn.click();
   }
 
diff --git a/lib/helpers/UiBaseLocators.ts b/lib/helpers/UiBaseLocators.ts
index 7d8d8dd..c4ed75d 100644
--- a/lib/helpers/UiBaseLocators.ts
+++ b/lib/helpers/UiBaseLocators.ts
@@ -114,7 +114,6 @@ export class UiBaseLocators {
   public readonly chooseDocumentInputBtn: Locator;
   public readonly chooseMediaInputBtn: Locator;
   public readonly container: Locator;
-  public readonly createDocumentBlueprintBtn: Locator;
   public readonly actionBtn: Locator;
   public readonly mediaPickerModalSubmitBtn: Locator;
   public readonly deleteBtn: Locator;
@@ -256,7 +255,6 @@ export class UiBaseLocators {
     this.gridBtn = this.page.getByLabel('Grid');
     this.listBtn = this.page.getByLabel('List');
     this.viewBundleBtn = this.page.locator('umb-collection-view-bundle uui-button svg');
-    this.createDocumentBlueprintBtn = page.getByLabel(/^Create Document Blueprint(…)?$/);
     this.chooseDocumentInputBtn = page.locator('umb-input-document').getByLabel('Choose');
     this.chooseMediaInputBtn = page.locator('umb-input-media').getByLabel('Choose');
     this.container = page.locator('#container');
diff --git a/package-lock.json b/package-lock.json
index ece31c9..ffc975b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@umbraco/playwright-testhelpers",
-  "version": "16.0.9",
+  "version": "16.0.10",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@umbraco/playwright-testhelpers",
-      "version": "16.0.9",
+      "version": "16.0.10",
       "license": "MIT",
       "dependencies": {
         "@umbraco/json-models-builders": "2.0.33",
diff --git a/package.json b/package.json
index 61666b6..5252a10 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umbraco/playwright-testhelpers",
-  "version": "16.0.9",
+  "version": "16.0.10",
   "description": "Test helpers for making playwright tests for Umbraco solutions",
   "main": "dist/lib/index.js",
   "files": [