diff --git a/app/assets/javascripts/discourse/app/components/modal/create-invite.gjs b/app/assets/javascripts/discourse/app/components/modal/create-invite.gjs
index bbf970c33aa..afa2afcfddd 100644
--- a/app/assets/javascripts/discourse/app/components/modal/create-invite.gjs
+++ b/app/assets/javascripts/discourse/app/components/modal/create-invite.gjs
@@ -242,8 +242,10 @@ export default class CreateInvite extends Component {
   }
 
   @action
-  showAdvancedMode() {
+  showAdvancedMode(event) {
     this.displayAdvancedOptions = true;
+    event.preventDefault();
+    event.stopPropagation();
   }
 
   @action
@@ -326,7 +328,9 @@ export default class CreateInvite extends Component {
             <a
               class="edit-link-options"
               role="button"
+              tabindex="0"
               {{on "click" this.showAdvancedMode}}
+              {{on "keydown" this.showAdvancedMode}}
             >{{i18n "user.invited.invite.edit_link_options"}}</a>
           </p>
         {{else}}
@@ -463,6 +467,7 @@ export default class CreateInvite extends Component {
             @action={{this.createLink}}
             @disabled={{this.saving}}
             class="btn-primary save-invite"
+            autofocus="true"
           />
         {{else}}
           <DButton
@@ -484,6 +489,7 @@ export default class CreateInvite extends Component {
               }}
               @action={{this.saveInviteAndSendEmail}}
               @disabled={{this.saving}}
+              autofocus="true"
               class="btn-primary save-invite-and-send-email"
             />
           {{/if}}