diff --git a/src/renderer/theme/GlobalStyles.ts b/src/renderer/theme/GlobalStyles.ts
index 4524dc119..3051ec7d3 100644
--- a/src/renderer/theme/GlobalStyles.ts
+++ b/src/renderer/theme/GlobalStyles.ts
@@ -317,10 +317,10 @@ svg text{
 .button:hover {
   cursor: pointer;
 }
-.button:focus {
+.button:focus,.button:focus-within {
   outline: none;
 }
-.button:focus-within {
+.button:focus-visible {
   outline: 2px solid ${({ theme }) => theme.accessibility.focusWithinColor};
 }
 .button[disabled]:hover {