diff --git a/apps/desktop/src/app/vault/vault-filter/filters/folder-filter.component.html b/apps/desktop/src/app/vault/vault-filter/filters/folder-filter.component.html
index 91a5b9ee772..eaa874d28e1 100644
--- a/apps/desktop/src/app/vault/vault-filter/filters/folder-filter.component.html
+++ b/apps/desktop/src/app/vault/vault-filter/filters/folder-filter.component.html
@@ -63,7 +63,7 @@
             class="edit-button"
             *ngIf="f.node.id"
             (click)="editFolder(f.node)"
-            appA11yTitle="{{ 'editFolder' | i18n }}"
+            appA11yTitle="{{ 'editFolder' | i18n }}: {{ f.node.name }}"
           >
             <i class="bwi bwi-pencil bwi-fw" aria-hidden="true"></i>
           </button>
diff --git a/apps/desktop/src/app/vault/vault-filter/filters/organization-filter.component.html b/apps/desktop/src/app/vault/vault-filter/filters/organization-filter.component.html
index dbba1353c9d..cfec1cf89d0 100644
--- a/apps/desktop/src/app/vault/vault-filter/filters/organization-filter.component.html
+++ b/apps/desktop/src/app/vault/vault-filter/filters/organization-filter.component.html
@@ -24,7 +24,7 @@
             class="filter-button"
             (click)="clearFilter()"
             [attr.aria-pressed]="!hasActiveFilter"
-            appA11yTitle="{{ 'vault' | i18n }}: {{ organizationGrouping.name }}"
+            appA11yTitle="{{ 'vault' | i18n }}: {{ organizationGrouping.name | i18n }}"
           >
             {{ organizationGrouping.name | i18n }}
           </button>
@@ -73,7 +73,7 @@
             class="filter-button"
             (click)="clearFilter()"
             [attr.aria-pressed]="!hasActiveFilter"
-            appA11yTitle="{{ 'vault' | i18n }}: {{ organizationGrouping.name }}"
+            appA11yTitle="{{ 'vault' | i18n }}: {{ organizationGrouping.name | i18n }}"
           >
             {{ organizationGrouping.name | i18n }}
           </button>
@@ -102,17 +102,18 @@
             <button
               class="filter-button"
               (click)="applyOrganizationFilter(organization)"
-              appA11yTitle="{{ 'vault' | i18n }}: {{ organization.name }}"
+              appA11yTitle="{{ 'vault' | i18n }}: {{ organization.name }} {{
+                organization.enabled ? '' : '(' + ('organizationIsDisabled' | i18n) + ')'
+              }}"
               [attr.aria-pressed]="activeFilter.selectedOrganizationId === organization.id"
             >
               <i class="bwi bwi-fw bwi-business" aria-hidden="true"></i>
               &nbsp;{{ organization.name }}
             </button>
-            <span class="ml-auto">
+            <span *ngIf="!organization.enabled" class="ml-auto">
               <i
-                *ngIf="!organization.enabled"
                 class="bwi bwi-fw bwi-exclamation-triangle text-danger mr-auto"
-                appA11yTitle="{{ 'organizationIsDisabled' | i18n }}"
+                aria-hidden="true"
               ></i>
             </span>
           </span>