diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml
index d19eaa6add943ba7e0bc06e8bd7c18b35d741f73..38d63fd9acc64be3e3e7d7bb607cfdff2136c54b 100644
--- a/app/views/groups/new.html.haml
+++ b/app/views/groups/new.html.haml
@@ -21,5 +21,5 @@
       = render 'shared/group_tips'
 
   .form-actions
-    = f.submit 'Create group', class: "btn btn-create", tabindex: 3
+    = f.submit 'Create group', class: "btn btn-create"
     = link_to 'Cancel', dashboard_groups_path, class: 'btn btn-cancel'
diff --git a/app/views/shared/_choose_group_avatar_button.html.haml b/app/views/shared/_choose_group_avatar_button.html.haml
index 000532b1c9a8f8ae71a271345c35eb28bd36f34b..ee0439105487cb921267d90ac6ab9f38385b62b3 100644
--- a/app/views/shared/_choose_group_avatar_button.html.haml
+++ b/app/views/shared/_choose_group_avatar_button.html.haml
@@ -1,4 +1,4 @@
-%a.choose-btn.btn.btn-sm.js-choose-group-avatar-button
+%button.choose-btn.btn.btn-sm.js-choose-group-avatar-button
   %i.fa.fa-paperclip
   %span Choose File ...
  
diff --git a/changelogs/unreleased/26238-buttons-not-accessible.yml b/changelogs/unreleased/26238-buttons-not-accessible.yml
new file mode 100644
index 0000000000000000000000000000000000000000..34d38d45709b6c94da1f0e46778c73e5e895ad2b
--- /dev/null
+++ b/changelogs/unreleased/26238-buttons-not-accessible.yml
@@ -0,0 +1,4 @@
+---
+title: Fixes buttons not being accessible via the keyboard when creating new group
+merge_request: 8469
+author: