diff --git a/templates/fragments/edit_project_form.html b/templates/fragments/edit_project_form.html
index b442d3f8..a5c6d485 100644
--- a/templates/fragments/edit_project_form.html
+++ b/templates/fragments/edit_project_form.html
@@ -22,7 +22,7 @@
       </p>
 
       <div class='action-group'>
-        <button type='submit' class='action-group__action usa-button' tabindex='0'>{{ action_text }} Project</button>
+        <button autofocus type='submit' class='action-group__action usa-button' tabindex='0'>{{ action_text }} Project</button>
         <button type='button' v-on:click="handleCancelSubmit" class='icon-link action-group__action' tabindex='0'>Cancel</button>
       </div>
     {% endcall %}
diff --git a/templates/requests/index.html b/templates/requests/index.html
index 8d74d497..3f5c121b 100644
--- a/templates/requests/index.html
+++ b/templates/requests/index.html
@@ -12,7 +12,7 @@
     {% include 'fragments/pending_financial_verification.html' %}
 
     <div class='action-group'>
-      <a v-on:click="closeModal('pendingFinancialVerification')" class='action-group__action usa-button'>Close</a>
+      <button autofocus type=button v-on:click="closeModal('pendingFinancialVerification')" class='action-group__action usa-button'>Close</button>
     </div>
   {% endcall %}
 
@@ -22,7 +22,7 @@
     {% include 'fragments/pending_ccpo_approval_modal.html' %}
 
     <div class='action-group'>
-      <a v-on:click="closeModal('pendingCCPOApproval')" class='action-group__action usa-button'>Close</a>
+      <button autofocus type='button' v-on:click="closeModal('pendingCCPOApproval')" class='action-group__action usa-button'>Close</button>
     </div>
   {% endcall %}
 
@@ -32,7 +32,7 @@
     {% include 'fragments/pending_ccpo_acceptance_alert.html' %}
 
     <div class='action-group'>
-      <a v-on:click="closeModal('pendingCCPOAcceptance')" class='action-group__action usa-button'>Close</a>
+      <button autofocus type='button' v-on:click="closeModal('pendingCCPOAcceptance')" class='action-group__action usa-button'>Close</button>
     </div>
   {% endcall %}
 
diff --git a/templates/workspaces/members/edit.html b/templates/workspaces/members/edit.html
index bdcac597..b1198791 100644
--- a/templates/workspaces/members/edit.html
+++ b/templates/workspaces/members/edit.html
@@ -99,6 +99,7 @@
                             value='{{ choice[0] }}'
                             {% if role == choice[0] %}
                               checked='checked'
+                              autofocus
                             {% endif %}
                           />
                           <label for="env_{{ env.id }}_{{ choice[0] }}">
@@ -118,8 +119,8 @@
                     <input type='hidden' name='env_{{ env.id }}' v-bind:value='new_role'/>
                     <div class='block-list__footer'>
                       <div class='action-group'>
-                        <a v-on:click="closeModal('{{ env.name }}RolesModal')" class='action-group__action usa-button'>Select Access Role</a>
-                        <a class='action-group__action icon-link icon-link--danger' v-on:click="closeModal('{{ env.name }}RolesModal'); cancel();" value="{{ value if value == role else role }}" >Cancel</a>
+                        <button type='button' v-on:click="closeModal('{{ env.name }}RolesModal')" class='action-group__action usa-button'>Select Access Role</button>
+                        <button type='button' class='action-group__action icon-link icon-link--danger' v-on:click="closeModal('{{ env.name }}RolesModal'); cancel();" value="{{ value if value == role else role }}" >Cancel</button>
                       </div>
                     </div>
                   </div>