diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart01.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart01.java
index 3883fe6aaee9c2b8d88c10d46b3b4db2aed0429c..2240c62b1878aeba1d8d5d42ba9badfc66f72a5e 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart01.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart01.java
@@ -23,6 +23,7 @@ import com.xeiam.xchart.Chart;
 import com.xeiam.xchart.SwingWrapper;
 import com.xeiam.xchart.demo.charts.ExampleChart;
 import com.xeiam.xchart.style.StyleManager.ChartType;
+import com.xeiam.xchart.style.StyleManager.LegendPosition;
 
 /**
  * Gaussian Blob
@@ -56,8 +57,7 @@ public class ScatterChart01 implements ExampleChart {
 
     // Customize Chart
     chart.getStyleManager().setChartTitleVisible(false);
-    chart.getStyleManager().setLegendVisible(false);
-
+    chart.getStyleManager().setLegendPosition(LegendPosition.InsideSW);
     // Series
     chart.addSeries("Gaussian Blob", xData, yData);
 
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Legend.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Legend.java
index 0e73d203d9308f2ea4843d55fd5db966f55f540b..81e02efa7f3ee86ec827224c4a32dab1a6c00bcb 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Legend.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Legend.java
@@ -159,12 +159,14 @@ public class Legend implements ChartPart {
         Series series = seriesMap.get(seriesId);
 
         if (getChart().getStyleManager().getChartType() != ChartType.Bar) {
+
           // paint line
-          if (series.getStroke() != null) {
+          if (getChart().getStyleManager().getChartType() != ChartType.Scatter && series.getStroke() != null) {
             g.setColor(series.getStrokeColor());
             g.setStroke(series.getStroke());
             g.drawLine(startx, starty + (int) (maxContentHeight / 2.0), (int) (startx + Marker.SIZE * 3.0), starty + (int) (maxContentHeight / 2.0));
           }
+
           // paint marker
           if (series.getMarker() != null) {
             g.setColor(series.getMarkerColor());