diff --git a/src/containers/line-mode.jsx b/src/containers/line-mode.jsx
index 3d0925f5..f9043ad4 100644
--- a/src/containers/line-mode.jsx
+++ b/src/containers/line-mode.jsx
@@ -9,7 +9,7 @@ import {clearSelection} from '../helper/selection';
 import {endPointHit, touching} from '../helper/snapping';
 import {drawHitPoint, removeHitPoint} from '../helper/guides';
 import {styleShape} from '../helper/style-path';
-import {changeStrokeColor} from '../reducers/stroke-style';
+import {changeStrokeColor, clearStrokeGradient} from '../reducers/stroke-style';
 import {changeStrokeWidth} from '../reducers/stroke-width';
 import {changeMode} from '../reducers/modes';
 import {clearSelectedItems} from '../reducers/selected-items';
@@ -60,10 +60,16 @@ class LineMode extends React.Component {
     activateTool () {
         clearSelection(this.props.clearSelectedItems);
         // Force the default line color if stroke is MIXED or transparent
-        const strokeColor = this.props.colorState.strokeColor.primary;
-        if (strokeColor === MIXED || strokeColor === null) {
+        const strokeColor1 = this.props.colorState.strokeColor.primary;
+        const strokeColor2 = this.props.colorState.strokeColor.secondary;
+        if (strokeColor1 === MIXED ||
+            (strokeColor1 === null &&
+                (strokeColor2 === null || strokeColor2 === MIXED))) {
             this.props.onChangeStrokeColor(LineMode.DEFAULT_COLOR);
         }
+        if (strokeColor2 === MIXED) {
+            this.props.clearStrokeGradient();
+        }
         // Force a minimum stroke width
         if (!this.props.colorState.strokeWidth) {
             this.props.onChangeStrokeWidth(1);
@@ -274,6 +280,7 @@ class LineMode extends React.Component {
 
 LineMode.propTypes = {
     clearSelectedItems: PropTypes.func.isRequired,
+    clearStrokeGradient: PropTypes.func.isRequired,
     colorState: PropTypes.shape({
         fillColor: ColorStyleProptype,
         strokeColor: ColorStyleProptype,
@@ -294,6 +301,9 @@ const mapDispatchToProps = dispatch => ({
     clearSelectedItems: () => {
         dispatch(clearSelectedItems());
     },
+    clearStrokeGradient: () => {
+        dispatch(clearStrokeGradient());
+    },
     handleMouseDown: () => {
         dispatch(changeMode(Modes.LINE));
     },
diff --git a/src/helper/style-path.js b/src/helper/style-path.js
index 59907b69..07663296 100644
--- a/src/helper/style-path.js
+++ b/src/helper/style-path.js
@@ -298,6 +298,20 @@ const applyGradientTypeToSelection = function (gradientType, applyToStroke, text
             continue;
         }
 
+        if (!hasGradient && applyToStroke) {
+            const noStrokeOriginally = item.strokeWidth === 0 || !itemColor ||
+                (itemColor.gradient &&
+                itemColor.gradient.stops &&
+                itemColor.gradient.stops.length === 2 &&
+                itemColor.gradient.stops[0].color.alpha === 0 &&
+                itemColor.gradient.stops[1].color.alpha === 0);
+            const hasGradientNow = itemColor1 || itemColor2;
+            if (noStrokeOriginally && hasGradientNow) {
+                // Make outline visible
+                item.strokeWidth = 1;
+            }
+        }
+
         if (itemColor1 === null) {
             itemColor1 = getColorStringForTransparent(itemColor2);
         }
@@ -439,6 +453,7 @@ const getColorsFromSelection = function (selectedItems, bitmapMode) {
                     itemFillColorString = item.fillColor.alpha === 0 ?
                         null :
                         item.fillColor.toCSS();
+                    itemFillColor2String = null;
                 }
             }
             if (item.strokeColor) {
@@ -447,12 +462,11 @@ const getColorsFromSelection = function (selectedItems, bitmapMode) {
 
                     let strokeColorString = primary;
                     const strokeColor2String = secondary;
-                    let strokeGradientType = gradientType;
+                    const strokeGradientType = gradientType;
 
                     // If the item's stroke width is 0, pretend the stroke color is null
                     if (!item.strokeWidth) {
                         strokeColorString = null;
-                        strokeGradientType = GradientTypes.SOLID;
                     }
 
                     // Stroke color is fill color in bitmap
@@ -479,6 +493,7 @@ const getColorsFromSelection = function (selectedItems, bitmapMode) {
                 }
             } else {
                 itemStrokeColorString = null;
+                itemStrokeColor2String = null;
             }
             // check every style against the first of the items
             if (firstChild) {
@@ -489,7 +504,7 @@ const getColorsFromSelection = function (selectedItems, bitmapMode) {
                 selectionStrokeColor2String = itemStrokeColor2String;
                 selectionFillGradientType = itemFillGradientType;
                 selectionStrokeGradientType = itemStrokeGradientType;
-                selectionStrokeWidth = itemStrokeColorString ? item.strokeWidth : 0;
+                selectionStrokeWidth = itemStrokeColorString || itemStrokeColor2String ? item.strokeWidth : 0;
                 if (item.strokeWidth && item.data && item.data.zoomLevel) {
                     selectionThickness = item.strokeWidth / item.data.zoomLevel;
                 }
@@ -516,7 +531,7 @@ const getColorsFromSelection = function (selectedItems, bitmapMode) {
             if (itemStrokeColor2String !== selectionStrokeColor2String) {
                 selectionStrokeColor2String = MIXED;
             }
-            const itemStrokeWidth = itemStrokeColorString ? item.strokeWidth : 0;
+            const itemStrokeWidth = itemStrokeColorString || itemStrokeColor2String ? item.strokeWidth : 0;
             if (selectionStrokeWidth !== itemStrokeWidth) {
                 selectionStrokeWidth = null;
             }
@@ -555,7 +570,6 @@ const getColorsFromSelection = function (selectedItems, bitmapMode) {
             thickness: selectionThickness
         };
     }
-
     return {
         fillColor: selectionFillColorString ? selectionFillColorString : null,
         fillColor2: selectionFillColor2String ? selectionFillColor2String : null,