1 files changed, 4 insertions, 4 deletions

diff --git a/js/panels/color/colorpanelbase.reel/colorpanelbase.js b/js/panels/color/colorpanelbase.reel/colorpanelbase.js
index 40c384fb..7208c2da 100755
--- a/js/panels/color/colorpanelbase.reel/colorpanelbase.js
+++ b/js/panels/color/colorpanelbase.reel/colorpanelbase.js
@@ -1452,6 +1452,10 @@ exports.ColorPanelBase = Montage.create(Component, {
             } else if (input === 'fill') {
                 other = 'stroke';
             }
+            if (this.colorManager.input === 'chip') {
+                this.application.ninja.colorController.colorPopupManager.hideColorPopup();
+                        return;
+                }
             //TODO: Change popup to use montage's built in popup
             if (this.colorManager.input === input) {
                 //
@@ -1469,10 +1473,6 @@ exports.ColorPanelBase = Montage.create(Component, {
                     }
                 }
             } else {
-                if (this.colorManager.input === 'chip') {
-                        this.application.ninja.colorController.colorPopupManager.hideColorPopup();
-                        return;
-                }
                 //TODO: Change popup to use montage's built in popup
                 this.application.ninja.colorController.colorPopupManager.hideColorPopup();
                 //