diff --git a/customize.dist/src/less2/include/alertify.less b/customize.dist/src/less2/include/alertify.less
index b86b5f8a2..acd8fcef1 100644
--- a/customize.dist/src/less2/include/alertify.less
+++ b/customize.dist/src/less2/include/alertify.less
@@ -200,7 +200,7 @@
                 }
                 .cp-usergrid-user, textarea, a, .fa-times {
                     outline: none;
-                    &:focus {
+                    &:focus-visible {
                         outline: @variables_focus_style;
                     }
                 }
@@ -244,7 +244,7 @@
                             }
                         }
                         outline: none;
-                        &:focus {
+                        &:focus-visible {
                             outline: @variables_focus_style;
                         }
                     }
diff --git a/customize.dist/src/less2/include/checkmark.less b/customize.dist/src/less2/include/checkmark.less
index 043062301..bd2d96e58 100644
--- a/customize.dist/src/less2/include/checkmark.less
+++ b/customize.dist/src/less2/include/checkmark.less
@@ -129,7 +129,7 @@
                 box-sizing: border-box;
             }
             outline: none;
-            &:focus {
+            &:focus-visible {
                 outline: @variables_focus_style;
             }
         }
@@ -217,7 +217,7 @@
                 height: var(--checkmark-dim1);
             }
             outline: none;
-            &:focus {
+            &:focus-visible {
                 outline: @variables_focus_style;
             }
         }
diff --git a/customize.dist/src/less2/include/drive.less b/customize.dist/src/less2/include/drive.less
index 05527b7b7..63e44fb84 100644
--- a/customize.dist/src/less2/include/drive.less
+++ b/customize.dist/src/less2/include/drive.less
@@ -31,7 +31,7 @@
         .tools_unselectable();
     }
     .btn-primary{
-        &:focus {
+        &:focus-visible {
             outline: @variables_focus_style;
         }
     }
@@ -352,7 +352,7 @@
                         overflow: hidden;
                         text-overflow: ellipsis;
                     }
-                    &:focus {
+                    &:focus-visible {
                         outline: @variables_focus_style;
                     }
                 }
@@ -380,7 +380,7 @@
                     padding-left: 20px;
                     .leftside-menu-category_main();
                     margin: 0;
-                    &:focus {
+                    &:focus-visible {
                         outline: @variables_focus_style;
                     }
                 }
@@ -409,7 +409,7 @@
                 position: relative;
                 top: -1px;
             }
-            &:focus {
+            &:focus-visible {
                 outline: @variables_focus_style;
                 border-radius: @variables_radius_S;
             }
diff --git a/customize.dist/src/less2/include/forms.less b/customize.dist/src/less2/include/forms.less
index 439a10fc9..dc5bf40b0 100644
--- a/customize.dist/src/less2/include/forms.less
+++ b/customize.dist/src/less2/include/forms.less
@@ -28,7 +28,7 @@
         }
         &.tui-full-calendar-content {
             font-size: @colortheme_app-font-size;
-            &:focus {
+            &:focus-visible {
                 outline: @variables_focus_style;
             }
         }
@@ -141,7 +141,7 @@
                 color: @cryptpad_text_col;
             }
             outline: none;
-            &:focus {
+            &:focus-visible {
                 outline: @variables_focus_style;
             }
         }
@@ -260,7 +260,7 @@
 
 
         outline: none;
-        &:focus {
+        &:focus-visible {
             outline: @variables_focus_style;
         }
         &::-moz-focus-inner {
diff --git a/customize.dist/src/less2/include/infopages.less b/customize.dist/src/less2/include/infopages.less
index db9d7f7c3..2635ba6e9 100644
--- a/customize.dist/src/less2/include/infopages.less
+++ b/customize.dist/src/less2/include/infopages.less
@@ -236,7 +236,7 @@ body.html {
                 border: 0px;
                 border-radius: @infopages-radius;
                 padding: 0.5em 0.7em;
-                &:focus {
+                &:focus-visible {
                     outline: @variables_focus_style;
                 }
             }
diff --git a/customize.dist/src/less2/include/sidebar-layout.less b/customize.dist/src/less2/include/sidebar-layout.less
index 8df3d37e7..90eb873ef 100644
--- a/customize.dist/src/less2/include/sidebar-layout.less
+++ b/customize.dist/src/less2/include/sidebar-layout.less
@@ -47,7 +47,7 @@
                     align-items: center;
                     .leftside-menu-category_main();
                     box-shadow: @cryptpad_ui_shadow;
-                    &:focus{
+                    &:focus-visible {
                         outline: @variables_focus_style;
                     }
                 }
diff --git a/customize.dist/src/less2/include/tokenfield.less b/customize.dist/src/less2/include/tokenfield.less
index 2a1c738ad..03ec82ff1 100644
--- a/customize.dist/src/less2/include/tokenfield.less
+++ b/customize.dist/src/less2/include/tokenfield.less
@@ -81,7 +81,7 @@
                 padding-left: 4px;
                 vertical-align: middle;
                 outline: none;
-                &:focus {
+                &:focus-visible {
                     outline: @variables_focus_style;
                 }
             }
diff --git a/customize.dist/src/less2/include/toolbar.less b/customize.dist/src/less2/include/toolbar.less
index a2fafb30e..723634a55 100644
--- a/customize.dist/src/less2/include/toolbar.less
+++ b/customize.dist/src/less2/include/toolbar.less
@@ -77,7 +77,7 @@
             &:hover {
                 background-color: contrast(@cp_toolbar-bg, darken(@cp_toolbar-bg, 5%), lighten(@cp_toolbar-bg, 5%));
             }
-            &:focus {
+            &:focus-visible {
                 outline: @variables_focus_style;
             }
         }
diff --git a/www/admin/app-admin.less b/www/admin/app-admin.less
index c60981a37..543e90616 100644
--- a/www/admin/app-admin.less
+++ b/www/admin/app-admin.less
@@ -23,7 +23,7 @@
     font: @colortheme_app-font;
 
     input, textarea, .cp-appblock {
-        &:focus {
+        &:focus-visible {
             outline: @variables_focus_style;
         }
     }
diff --git a/www/calendar/app-calendar.less b/www/calendar/app-calendar.less
index 5834f1e64..9cf1325ca 100644
--- a/www/calendar/app-calendar.less
+++ b/www/calendar/app-calendar.less
@@ -633,7 +633,7 @@
                             color: @cp_sidebar-left-active-fg;
                             border: 0px;
                         }
-                        &:focus {
+                        &:focus-visible {
                             outline: @variables_focus_style;
                         }
                         i {
diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index 3f69e274e..86e1052b5 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -177,7 +177,7 @@
         align-self: flex-start;
         outline-style: none;
         border-radius: @variables_radius;
-        &:focus {
+        &:focus-visible {
             outline: @variables_focus_style;
         }
         @media (hover: none) {
@@ -413,7 +413,7 @@
                 .fa {
                     margin-right: 5px;
                 }
-                &:focus{
+                &:focus-visible {
                     outline: @variables_focus_style;
                 }
             }
@@ -651,7 +651,7 @@
             &:hover {
                 background-color: @cp_kanban-add-hover;
             }
-            &:focus {
+            &:focus-visible {
                 outline: @variables_focus_style;
             }
         }
diff --git a/www/settings/app-settings.less b/www/settings/app-settings.less
index 2808b60ac..98f90105b 100644
--- a/www/settings/app-settings.less
+++ b/www/settings/app-settings.less
@@ -41,7 +41,7 @@
     #cp-sidebarlayout-container {
         #cp-sidebarlayout-rightside {
             input, button, span[tabindex="0"] {
-                &:focus{
+                &:focus-visible {
                     outline: @variables_focus_style;
                 }
             }
diff --git a/www/teams/app-team.less b/www/teams/app-team.less
index e6170dd3e..a5128a322 100644
--- a/www/teams/app-team.less
+++ b/www/teams/app-team.less
@@ -64,7 +64,7 @@
         }
         #cp-sidebarlayout-rightside{
             input, button, textarea {
-                &:focus{
+                &:focus-visible {
                     outline: @variables_focus_style;
                 }
             }
@@ -154,7 +154,7 @@
                 height: 384px;
                 padding: 50px;
                 margin: 5px;
-                &:focus{
+                &:focus-visible {
                     outline: @variables_focus_style;
                 }
                 &.create, &:not(.empty) {