diff --git a/apps/common/main/lib/component/ColorButton.js b/apps/common/main/lib/component/ColorButton.js
index f6c05bda7..777e24128 100644
--- a/apps/common/main/lib/component/ColorButton.js
+++ b/apps/common/main/lib/component/ColorButton.js
@@ -206,7 +206,7 @@ define([
         },
 
         focus: function() {
-            this.cmpEl && this.cmpEl.focus();
+            $('button', this.cmpEl).focus();
         },
 
         onAfterKeydownMenu: function(e) {
diff --git a/apps/common/main/lib/component/FocusManager.js b/apps/common/main/lib/component/FocusManager.js
index 496bea0b8..df554d5e8 100644
--- a/apps/common/main/lib/component/FocusManager.js
+++ b/apps/common/main/lib/component/FocusManager.js
@@ -71,8 +71,6 @@ Common.UI.FocusManager = new(function() {
                         item.selector = '.radiobox';
                     else if (field instanceof Common.UI.TreeView)
                         item.selector = '.treeview';
-                    else if (field instanceof Common.UI.ColorButton)
-                        item.selector = '.btn-group';
                     else if (field instanceof Common.UI.Button)
                         item.selector = 'button';
                     else
diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less
index e007314cd..6e545e95a 100644
--- a/apps/common/main/resources/less/buttons.less
+++ b/apps/common/main/resources/less/buttons.less
@@ -679,11 +679,9 @@
         .caret {
         }
     }
-}
 
-.btn-group {
-    &:focus, &:active, &.open {
-        .btn-color:not(.disabled) {
+    &:not(.disabled) {
+        &:focus, .btn-group.open &, .btn-group:active & {
             border-color: @border-control-focus-ie;
             border-color: @border-control-focus;
         }
diff --git a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
index f5c1c0a57..f1685f795 100644
--- a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
+++ b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
@@ -379,6 +379,7 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
                 additionalAlign: this.menuAddAlign,
                 color: 'auto',
                 auto: true,
+                cls: 'move-focus',
                 takeFocusOnClose: true
             });
             this.colorsBorder = this.btnBorderColor.getPicker();
@@ -423,6 +424,7 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
                 parentEl: $('#paragraphadv-back-color-btn'),
                 transparent: true,
                 additionalAlign: this.menuAddAlign,
+                cls: 'move-focus',
                 takeFocusOnClose: true
             });
             this.colorsBack = this.btnBackColor.getPicker();