diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects-list/projects-list.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects-list/projects-list.component.html
index 9f5830cda3..5e34ae9c19 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects-list/projects-list.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects-list/projects-list.component.html
@@ -58,7 +58,7 @@
         <i class="bwi bwi-collection tw-text-xl tw-text-muted" aria-hidden="true"></i>
       </td>
       <td bitCell class="tw-break-all">
-        <a [routerLink]="[project.id]">{{ project.name }}</a>
+        <a bitLink [routerLink]="[project.id]">{{ project.name }}</a>
       </td>
       <td bitCell>{{ project.revisionDate | date: "medium" }}</td>
       <td bitCell>
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.html
index a1f1730574..c262f1f6e5 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.html
@@ -58,8 +58,8 @@
       <td bitCell class="tw-w-0 tw-pr-0">
         <i class="bwi bwi-wrench tw-text-xl tw-text-muted" aria-hidden="true"></i>
       </td>
-      <td bitCell>
-        <a [routerLink]="serviceAccount.id" class="tw-break-all">
+      <td bitCell class="tw-break-all">
+        <a bitLink [routerLink]="serviceAccount.id">
           {{ serviceAccount.name }}
         </a>
       </td>
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.html
index 509123931c..23a4231283 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.html
@@ -58,7 +58,11 @@
       <td bitCell class="tw-w-0 tw-pr-0">
         <i class="bwi bwi-key tw-text-xl tw-text-muted" aria-hidden="true"></i>
       </td>
-      <td bitCell class="tw-break-all">{{ secret.name }}</td>
+      <td bitCell class="tw-break-all">
+        <button type="button" bitLink (click)="editSecretEvent.emit(secret.id)">
+          {{ secret.name }}
+        </button>
+      </td>
       <td bitCell>
         <span
           *ngFor="let project of secret.projects"