diff --git a/libs/angular/src/billing/components/premium-upgrade-dialog/premium-upgrade-dialog.component.html b/libs/angular/src/billing/components/premium-upgrade-dialog/premium-upgrade-dialog.component.html
index 2f7b5892e58..1e35b731dfc 100644
--- a/libs/angular/src/billing/components/premium-upgrade-dialog/premium-upgrade-dialog.component.html
+++ b/libs/angular/src/billing/components/premium-upgrade-dialog/premium-upgrade-dialog.component.html
@@ -13,7 +13,6 @@
         buttonType="main"
         size="default"
         [label]="'close' | i18n"
-        [showTooltipOnFocus]="false"
         (click)="close()"
       ></button>
     </header>
@@ -51,6 +50,7 @@
         <!-- Button space (always reserved) -->
         <div class="tw-my-5 tw-h-12">
           <button
+            cdkFocusInitial
             bitButton
             [buttonType]="cardDetails.button.type"
             [block]="true"