diff --git a/app/javascript/application.scss b/app/javascript/application.scss
index 1243633a..d9ddd399 100644
--- a/app/javascript/application.scss
+++ b/app/javascript/application.scss
@@ -4,7 +4,8 @@
 @import "tailwindcss/components";
 @import "tailwindcss/utilities";
 
-:focus-visible {
+:focus-visible,
+.btn:focus-visible {
   outline-color: rgb(14, 99, 200);
   outline-style: solid;
   outline-width: 8px;
diff --git a/app/javascript/form.scss b/app/javascript/form.scss
index c6f01593..d171688f 100644
--- a/app/javascript/form.scss
+++ b/app/javascript/form.scss
@@ -4,7 +4,8 @@
 @import "tailwindcss/components";
 @import "tailwindcss/utilities";
 
-:focus-visible {
+:focus-visible,
+.btn:focus-visible {
   outline-color: rgb(14, 99, 200);
   outline-style: solid;
   outline-width: 8px;
diff --git a/app/views/submit_form/show.html.erb b/app/views/submit_form/show.html.erb
index 930844b1..4c303cb8 100644
--- a/app/views/submit_form/show.html.erb
+++ b/app/views/submit_form/show.html.erb
@@ -21,7 +21,7 @@
           </h1>
           <div class="flex items-center space-x-2" style="margin-left: 20px; flex-shrink: 0">
             <% if @form_configs[:with_decline] %>
-              <label id="decline_button_header" for="<%= decline_modal_checkbox_uuid = SecureRandom.uuid %>" class="btn btn-sm !px-5"><%= t(:decline) %></label>
+              <label id="decline_button_header" for="<%= decline_modal_checkbox_uuid = SecureRandom.uuid %>" class="btn btn-sm !px-5" tabindex="0"><%= t(:decline) %></label>
             <% end %>
             <% if @form_configs[:with_partial_download] %>
               <download-button data-src="<%= submit_form_download_index_path(@submitter.slug) %>" class="btn btn-neutral text-white btn-sm !px-4">
@@ -39,7 +39,7 @@
         </div>
         <scroll-buttons class="fixed right-5 top-2 hidden md:flex gap-1 z-50 ease-in-out opacity-0 -translate-y-10">
           <% if @form_configs[:with_decline] %>
-            <label id="decline_button_scroll" for="<%= decline_modal_checkbox_uuid %>" class="btn btn-sm px-0">
+            <label id="decline_button_scroll" for="<%= decline_modal_checkbox_uuid %>" class="btn btn-sm px-0" tabindex="0">
               <span class="min-[1366px]:inline hidden px-3">
                 <%= t(:decline) %>
               </span>