diff --git a/src/case/colorchooser/colorpicker/editor.colorpicker.hex.js b/src/case/colorchooser/colorpicker/editor.colorpicker.hex.js
index 6aa07afe8..83b7b9462 100644
--- a/src/case/colorchooser/colorpicker/editor.colorpicker.hex.js
+++ b/src/case/colorchooser/colorpicker/editor.colorpicker.hex.js
@@ -72,20 +72,9 @@ BI.HexColorPickerEditor = BI.inherit(BI.Widget, {
                             listeners: [{
                                 eventName: BI.ColorChooserShowButton.EVENT_CHANGE,
                                 action: function () {
-                                    if (this.isSelected()) {
-                                        self.lastColor = self.getValue();
-                                        self.setValue("transparent");
-                                    } else {
-                                        if (self.lastColor === "transparent") {
-                                            self.lastColor = "";
-                                        }
-                                        self.setValue(self.lastColor || "#ffffff");
-                                    }
-                                    if ((self.R.isValid() && self.G.isValid() && self.B.isValid()) ||
-                                        self._isEmptyRGB()) {
-                                        self.colorShow.element.css("background-color", self.getValue());
-                                        self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE);
-                                    }
+                                    var value = self.getValue();
+                                    self.setValue("transparent");
+                                    (value !== "transparent") && self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE);
                                 }
                             }],
                             ref: function (_ref) {
@@ -101,16 +90,9 @@ BI.HexColorPickerEditor = BI.inherit(BI.Widget, {
                                 listeners: [{
                                     eventName: BI.ColorChooserShowButton.EVENT_CHANGE,
                                     action: function () {
-                                        if (this.isSelected()) {
-                                            self.lastColor = self.getValue();
-                                            self.setValue("");
-                                        } else {
-                                            self.setValue(self.lastColor || "#ffffff");
-                                        }
-                                        if ((self.R.isValid() && self.G.isValid() && self.B.isValid()) || self._isEmptyRGB()) {
-                                            self.colorShow.element.css("background-color", self.getValue());
-                                            self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE);
-                                        }
+                                        var value = self.getValue();
+                                        self.setValue("");
+                                        (value !== "") && self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE);
                                     }
                                 }],
                                 ref: function (_ref) {
diff --git a/src/case/colorchooser/colorpicker/editor.colorpicker.js b/src/case/colorchooser/colorpicker/editor.colorpicker.js
index 4be3375a4..9d0dbbca0 100644
--- a/src/case/colorchooser/colorpicker/editor.colorpicker.js
+++ b/src/case/colorchooser/colorpicker/editor.colorpicker.js
@@ -72,16 +72,9 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
             title: BI.i18nText("BI-Basic_Auto")
         });
         this.none.on(BI.IconButton.EVENT_CHANGE, function () {
-            if (this.isSelected()) {
-                self.lastColor = self.getValue();
-                self.setValue("");
-            } else {
-                self.setValue(self.lastColor || "#ffffff");
-            }
-            if ((self.R.isValid() && self.G.isValid() && self.B.isValid()) || self._isEmptyRGB()) {
-                self.colorShow.element.css("background-color", self.getValue());
-                self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE);
-            }
+            var value = self.getValue();
+            self.setValue("");
+            (value !== "") && self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE);
         });
 
         this.transparent = BI.createWidget({
@@ -94,20 +87,9 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
             title: BI.i18nText("BI-Transparent_Color")
         });
         this.transparent.on(BI.IconButton.EVENT_CHANGE, function () {
-            if (this.isSelected()) {
-                self.lastColor = self.getValue();
-                self.setValue("transparent");
-            } else {
-                if (self.lastColor === "transparent") {
-                    self.lastColor = "";
-                }
-                self.setValue(self.lastColor || "#ffffff");
-            }
-            if ((self.R.isValid() && self.G.isValid() && self.B.isValid()) ||
-                self._isEmptyRGB()) {
-                self.colorShow.element.css("background-color", self.getValue());
-                self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE);
-            }
+            var value = self.getValue();
+            self.setValue("transparent");
+            (value !== "transparent") && self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE);
         });
 
         BI.createWidget({