diff --git a/resources/sass/core/layout.scss b/resources/sass/core/layout.scss
index 22ba573bc..d2eb33e20 100644
--- a/resources/sass/core/layout.scss
+++ b/resources/sass/core/layout.scss
@@ -8,6 +8,13 @@ body {
   overflow-x: hidden;
 }
 
+a, button, .btn {
+    &:focus-visible {
+        outline: 2px auto #005fcc !important;  /* Blue outline */
+    }
+}
+
+
 
 @include media-breakpoint-up(xl) {
     .aside {
diff --git a/resources/views/layouts/accordion.blade.php b/resources/views/layouts/accordion.blade.php
index 51c8b5ec3..c690700ed 100644
--- a/resources/views/layouts/accordion.blade.php
+++ b/resources/views/layouts/accordion.blade.php
@@ -6,9 +6,9 @@
              data-bs-target="#collapse-{{\Illuminate\Support\Str::slug($name)}}"
              aria-expanded="true"
              aria-controls="collapse-{{\Illuminate\Support\Str::slug($name)}}">
-            <h6 class="btn btn-link btn-group-justified pt-2 pb-2 mb-0 pe-0 ps-0 d-flex align-items-center">
+            <button type="button" class="btn btn-link btn-group-justified pt-2 pb-2 mb-0 pe-0 ps-0 d-flex align-items-center">
                 <x-orchid-icon path="bs.chevron-right" class="small me-2"/> {!! $name !!}
-            </h6>
+            </button>
         </div>
 
         <div id="collapse-{{\Illuminate\Support\Str::slug($name)}}"