1 files changed, 1 insertions, 3 deletions

diff --git a/js/panels/color/colorpopup-manager.js b/js/panels/color/colorpopup-manager.js
index f4bb9203..0f8e20e6 100755
--- a/js/panels/color/colorpopup-manager.js
+++ b/js/panels/color/colorpopup-manager.js
@@ -503,11 +503,9 @@ exports.ColorPopupManager = Montage.create(Component, {
                         //
                         this._popupGradientChipBase.popup.removeEventListener('didDraw', this, false);
                         //TODO: Add correct input setback
-                        /*
-if (this.colorManager.input !== 'stroke' && this.colorManager.input !== 'fill' && this.application.ninja.colorController.colorView.previousInput) {
+                        if (this.colorManager.input !== 'stroke' && this.colorManager.input !== 'fill' && this.application.ninja.colorController.colorView.previousInput && (!this._popupChipBase || (this._popupChipBase && !this._popupChipBase.opened))) {
                                 this.colorManager.input = this.application.ninja.colorController.colorView.previousInput;
                         }
-*/
                         //
                 this.application.ninja.popupManager.removePopup(this._popupGradientChipBase.popup.element);
                         this._popupGradientChipBase.opened = false;