diff --git a/core/themes/claro/claro.info.yml b/core/themes/claro/claro.info.yml
index 5c303d8c74..480aead979 100644
--- a/core/themes/claro/claro.info.yml
+++ b/core/themes/claro/claro.info.yml
@@ -113,7 +113,7 @@ libraries-override:
         css/views_ui.admin.theme.css: css/theme/views_ui.admin.theme.css
 
 libraries-extend:
-  ckeditor/drupal.ckeditor:
+  ckeditor/drupal.ckeditor.admin:
     - claro/ckeditor-editor
   core/ckeditor:
     - claro/ckeditor-dialog
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;
+}