diff --git a/apps/client/src/stylesheets/theme-next/notes/text.css b/apps/client/src/stylesheets/theme-next/notes/text.css
index a82a9556c..b214cf4f5 100644
--- a/apps/client/src/stylesheets/theme-next/notes/text.css
+++ b/apps/client/src/stylesheets/theme-next/notes/text.css
@@ -20,7 +20,7 @@
     --ck-color-button-on-background: transparent;
     --ck-color-button-on-hover-background: var(--hover-item-background-color);
     
-    --ck-focus-ring: 1px solid transparent; /* TODO: Find a solution to keep it visible in an elegant way */
+    --ck-focus-ring: 1px solid transparent;
     --ck-color-focus-border: var(--input-focus-outline-color);
     --ck-focus-outer-shadow: none;
     --ck-focus-disabled-outer-shadow: none;
@@ -54,6 +54,11 @@
     opacity: .75;
 }
 
+/* Focus visible */
+.ck.ck-toolbar .ck-button:focus-visible {
+    --ck-focus-ring: 1px solid var(--input-focus-outline-color);
+}
+
 /* 
  * Dropdowns
  */