diff --git a/app/styles/ui/_tab-bar.scss b/app/styles/ui/_tab-bar.scss
index 77aa5eb717..31b86d5d41 100644
--- a/app/styles/ui/_tab-bar.scss
+++ b/app/styles/ui/_tab-bar.scss
@@ -126,7 +126,7 @@
     border-radius: var(--border-radius);
     min-width: 150px;
 
-    &:focus {
+    &:focus-visible {
       border-radius: var(--outlined-border-radius);
       outline-offset: 3px;
     }
diff --git a/app/styles/ui/_vertical-segmented-control.scss b/app/styles/ui/_vertical-segmented-control.scss
index fe86359b7c..f022eac9a8 100644
--- a/app/styles/ui/_vertical-segmented-control.scss
+++ b/app/styles/ui/_vertical-segmented-control.scss
@@ -77,7 +77,7 @@ fieldset.vertical-segmented-control {
       }
     }
 
-    &:focus li {
+    &:focus-visible li {
       &:first-child {
         border-top-left-radius: var(--outlined-border-radius);
         border-top-right-radius: var(--outlined-border-radius);