3 files changed, 13 insertions, 6 deletions

diff --git a/js/components/gradientpicker.reel/gradientpicker.js b/js/components/gradientpicker.reel/gradientpicker.js
index 0940be3c..da4e8c0f 100755
--- a/js/components/gradientpicker.reel/gradientpicker.js
+++ b/js/components/gradientpicker.reel/gradientpicker.js
@@ -397,7 +397,7 @@ exports.GradientPicker = Montage.create(Component, {
             actionEvent.initEvent(type, true, true);
             actionEvent.type = type;
             actionEvent.wasSetByCode = userInitiated;
-            actionEvent.gradient = {stops: this.value, mode: this.mode, css: css};
+            actionEvent.gradient = {stops: this.value, mode: this.mode, gradientMode: this.mode, css: css};
             this.dispatchEvent(actionEvent);
         }
     }
diff --git a/js/controllers/color-controller.js b/js/controllers/color-controller.js
index a6e41dd3..53573baf 100755
--- a/js/controllers/color-controller.js
+++ b/js/controllers/color-controller.js
@@ -259,6 +259,7 @@ exports.ColorController = Montage.create(Component, {
                                 //Radial gradient
                                 gradient.stops = [];
                                 gradient.mode = 'radial';
+                                gradient.gradientMode = 'radial';
                                 gradient.css = css;
                                 //
                                 arr = css.split('%,');
@@ -284,6 +285,7 @@ exports.ColorController = Montage.create(Component, {
                                 //Linear gradient
                                 gradient.stops = [];
                                 gradient.mode = 'linear';
+                                gradient.gradientMode = 'linear';
                                 gradient.css = css;
                                 //
                                 arr = css.split('from(');
@@ -317,7 +319,7 @@ exports.ColorController = Montage.create(Component, {
                                 }
                         }
                         //Creating gradient object
-                        color = {mode: 'gradient', value: {stops: gradient.stops, mode: gradient.mode, css: css}};
+                        color = {mode: 'gradient', value: {stops: gradient.stops, mode: gradient.mode, gradientMode: gradient.gradientMode, css: css}};
                 } else if (css){
                         //Simple solid color
                         color = this.parseCssToColor(css);
diff --git a/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js b/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js
index 299e603d..3eae3ea3 100755
--- a/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js
+++ b/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js
@@ -379,11 +379,16 @@ exports.ColorPanelPopup = Montage.create(Component, {
                 gradient.element = container;
                 gradient.hack = this.hack; // TODO: Remove
                 //
-                if (g && g.value && g.value.stops && g.value.mode) {
-                        gradient._mode = g.value.mode;
-                        gradient.value = g.value.stops;
+                if (g && g.value && g.value.stops) {
+                        if (g.value.gradientMode) {
+                                gradient._mode = g.value.gradientMode;
+                                gradient.value = g.value.stops;
+                        } else {
+                                gradient._mode = 'linear';
+                                gradient.value = g.value.stops;
+                        }
                 } else {
-                        gradient._mode = this.defaultGradient.mode;
+                        gradient._mode = this.defaultGradient.gradientMode;
                         gradient.value = this.defaultGradient.stops;
                 }
                 //