diff --git a/core/themes/claro/claro.libraries.yml b/core/themes/claro/claro.libraries.yml
index cde2ce22db..ea1df46317 100644
--- a/core/themes/claro/claro.libraries.yml
+++ b/core/themes/claro/claro.libraries.yml
@@ -59,6 +59,7 @@ global-styling:
       css/components/views-ui.css: {}
     theme:
       css/theme/colors.css: {}
+      css/theme/ckeditor-editor.css: {}
     layout:
       css/layout/breadcrumb.css: {}
       css/layout/local-actions.css: {}
diff --git a/core/themes/claro/css/theme/ckeditor-editor.css b/core/themes/claro/css/theme/ckeditor-editor.css
index bb3dc4abe8..6a2c884aeb 100644
--- a/core/themes/claro/css/theme/ckeditor-editor.css
+++ b/core/themes/claro/css/theme/ckeditor-editor.css
@@ -93,3 +93,6 @@
 [disabled] + .cke .cke_path_empty::after {
   content: none;
 }
+.ckeditor-toolbar-disabled .ckeditor-buttons li a:focus {
+  box-shadow: 0 0 0 2px #fff, 0 0 0 5px #26a769;
+}
diff --git a/core/themes/claro/css/theme/ckeditor-editor.pcss.css b/core/themes/claro/css/theme/ckeditor-editor.pcss.css
index 0ed93d4c70..5099d4dcd6 100644
--- a/core/themes/claro/css/theme/ckeditor-editor.pcss.css
+++ b/core/themes/claro/css/theme/ckeditor-editor.pcss.css
@@ -104,3 +104,6 @@
 [disabled] + .cke .cke_path_empty::after {
   content: none;
 }
+.ckeditor-toolbar-disabled .ckeditor-buttons li a:focus {
+  box-shadow: 0 0 0 2px #fff, 0 0 0 5px #26a769;
+}