2 files changed, 6 insertions, 2 deletions

diff --git a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js
index 4865d3dd..f2e5bb2e 100755
--- a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js
+++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js
@@ -295,6 +295,8 @@ exports.ColorPanelPopup = Montage.create(Component, {
                 }
                 //
                 if (!this.isPopupChip) this.application.ninja.colorController.colorPopupManager.hideColorChipPopup();
+                //
+                this.application.ninja.colorController.colorPopupManager.hideGradientChipPopup();
         }
     },
     ////////////////////////////////////////////////////////////////////
diff --git a/js/panels/color/colorpopup-manager.js b/js/panels/color/colorpopup-manager.js
index 5be652c9..f4bb9203 100755
--- a/js/panels/color/colorpopup-manager.js
+++ b/js/panels/color/colorpopup-manager.js
@@ -502,10 +502,12 @@ exports.ColorPopupManager = Montage.create(Component, {
                 if (this._popupGradientChipBase && this._popupGradientChipBase.opened) {
                         //
                         this._popupGradientChipBase.popup.removeEventListener('didDraw', this, false);
-                        //Making sure to return color manager to either stroke or fill (might be a Hack for now)
-                        if (this.colorManager.input !== 'stroke' && this.colorManager.input !== 'fill' && this.application.ninja.colorController.colorView.previousInput) {
+                        //TODO: Add correct input setback
+                        /*
+if (this.colorManager.input !== 'stroke' && this.colorManager.input !== 'fill' && this.application.ninja.colorController.colorView.previousInput) {
                                 this.colorManager.input = this.application.ninja.colorController.colorView.previousInput;
                         }
+*/
                         //
                 this.application.ninja.popupManager.removePopup(this._popupGradientChipBase.popup.element);
                         this._popupGradientChipBase.opened = false;