diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js
index 1171d9962..04d46adc4 100644
--- a/apps/documenteditor/main/app/controller/Main.js
+++ b/apps/documenteditor/main/app/controller/Main.js
@@ -520,7 +520,11 @@ define([
                     toolbarView.btnInsertShape.toggle(false, false);
                     toolbarView.btnInsertText.toggle(false, false);
                 }
-
+                if (this.appOptions.isEdit && toolbarView && toolbarView.btnHighlightColor.pressed &&
+                    ( !_.isObject(arguments[1]) || arguments[1].id !== 'id-toolbar-btn-highlight')) {
+                    this.api.SetMarkerFormat(false);
+                    toolbarView.btnHighlightColor.toggle(false, false);
+                }
                 application.getController('DocumentHolder').getView('DocumentHolder').focus();
 
                 if (this.api) {
diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js
index a07326226..9e62acba4 100644
--- a/apps/documenteditor/main/app/controller/Toolbar.js
+++ b/apps/documenteditor/main/app/controller/Toolbar.js
@@ -2554,7 +2554,7 @@ define([
                 me.api.SetMarkerFormat(true, true, parseInt(r, 16), parseInt(g, 16), parseInt(b, 16));
             }
 
-            Common.NotificationCenter.trigger('edit:complete', me.toolbar);
+            Common.NotificationCenter.trigger('edit:complete', me.toolbar, me.toolbar.btnHighlightColor);
             Common.component.Analytics.trackEvent('ToolBar', 'Highlight Color');
         },