diff --git a/dashboard-prime/src/components/access/RoleManager.vue b/dashboard-prime/src/components/access/RoleManager.vue
index 267523ef34..4f01a6087b 100644
--- a/dashboard-prime/src/components/access/RoleManager.vue
+++ b/dashboard-prime/src/components/access/RoleManager.vue
@@ -318,7 +318,7 @@ defineExpose({
             </div>
             <div>
               <SkillsButton variant="outline-hc" @click="addUserRole" :disabled="addUsrBtnDisabled" data-cy="addUserBtn"
-                            label="Add User"
+                            label="Add User" id="addUserBtn" :track-for-focus="true"
                             :icon="isSaving ? 'fa fa-circle-notch fa-spin fa-3x-fa-fw' : 'fas fa-arrow-circle-right'">
               </SkillsButton>
             </div>
@@ -385,6 +385,8 @@ defineExpose({
                   </SkillsButton>
                   <SkillsButton @click="deleteUserRoleConfirm(slotProps.data)"
                                 :disabled="!notCurrentUser(slotProps.data.userId)"
+                                id="removeUserBtn"
+                                :track-for-focus="true"
                                 :aria-label="`remove access role from user ${slotProps.data.userId}`"
                                 data-cy="removeUserBtn" icon="fas fa-trash" label="Delete" size="small">
                   </SkillsButton>
diff --git a/dashboard-prime/src/components/badges/global/GlobalBadgeSkills.vue b/dashboard-prime/src/components/badges/global/GlobalBadgeSkills.vue
index 91f34ac393..3591847ddc 100644
--- a/dashboard-prime/src/components/badges/global/GlobalBadgeSkills.vue
+++ b/dashboard-prime/src/components/badges/global/GlobalBadgeSkills.vue
@@ -185,6 +185,8 @@ const searchChanged = (query) => {
               <Column header="Delete">
                 <template #body="slotProps">
                   <SkillsButton v-on:click="deleteSkill(slotProps.data)" size="small"
+                                :id="`deleteSkill_${slotProps.data.skillId}`"
+                                :track-for-focus="true"
                                 :data-cy="`deleteSkill_${slotProps.data.skillId}`" icon="fas fa-trash" label="Delete"
                                 :aria-label="`remove dependency on ${slotProps.data.skillId}`">
                   </SkillsButton>