diff --git a/ui-ngx/src/app/shared/components/button/toggle-password.component.html b/ui-ngx/src/app/shared/components/button/toggle-password.component.html
index 69301ce644..39b74fafe3 100644
--- a/ui-ngx/src/app/shared/components/button/toggle-password.component.html
+++ b/ui-ngx/src/app/shared/components/button/toggle-password.component.html
@@ -15,6 +15,6 @@
     limitations under the License.
 
 -->
-<button mat-icon-button type="button" (click)="togglePassword($event)" [attr.aria-pressed]="showPassword" *ngIf="!hideToggle">
+<button mat-icon-button type="button" tabindex="-1" (click)="togglePassword($event)" [attr.aria-pressed]="showPassword" *ngIf="!hideToggle">
   <mat-icon>{{ showPassword ? 'visibility' : 'visibility_off' }}</mat-icon>
 </button>