diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Axis.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Axis.java
index d6b8dcfa1be376f09e9231033d3c3dfc2d019ae9..15b44ee2bafa7b45b73997ab29bbeb46afe57fd1 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Axis.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Axis.java
@@ -197,9 +197,23 @@ public class Axis implements ChartPart {
         chartLegendWidth = getChartPainter().getChartLegend().getSizeHint()[0];
       }
 
-      int width = (int) (getChartPainter().getWidth() - axisPair.getyAxis().getBounds().getWidth() - chartLegendWidth - 2 * getChartPainter().getStyleManager().getChartPadding()
-          - getChartPainter().getStyleManager().getPlotPadding() - (getChartPainter().getStyleManager().getLegendPosition() == LegendPosition.OutsideE ? getChartPainter().getStyleManager()
-          .getChartPadding() : 0));
+      int width = (int) (
+
+      getChartPainter().getWidth()
+
+      - axisPair.getyAxis().getBounds().getWidth()
+
+      - chartLegendWidth
+
+      - 2 * getChartPainter().getStyleManager().getChartPadding()
+
+      - (getChartPainter().getStyleManager().isYAxisTicksVisible() ? (getChartPainter().getStyleManager().getPlotPadding() + 1) : 0)
+
+      - (getChartPainter().getStyleManager().getLegendPosition() == LegendPosition.OutsideE && getChartPainter().getStyleManager().isLegendVisible() ? getChartPainter().getStyleManager()
+          .getChartPadding() : 0)
+
+      );
+
       int height = this.getSizeHint();
       Rectangle xAxisRectangle = new Rectangle(xOffset, yOffset, width, height);
       this.paintZone = xAxisRectangle;
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Plot.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Plot.java
index b2d81a31283b0e9b38015ab51b004d0de21adc1d..32bf69a36473d5f09db41b5432917c0c765add13 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Plot.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Plot.java
@@ -63,7 +63,9 @@ public class Plot implements ChartPart {
 
     + chartPainter.getAxisPair().getyAxis().getBounds().getWidth()
 
-    + (chartPainter.getStyleManager().isYAxisTicksVisible() ? (chartPainter.getStyleManager().getPlotPadding() + 1) : 0));
+    + (chartPainter.getStyleManager().isYAxisTicksVisible() ? (chartPainter.getStyleManager().getPlotPadding() + 1) : 0)
+
+    );
 
     int yOffset = (int) (chartPainter.getAxisPair().getyAxis().getBounds().getY());
     int width = (int) chartPainter.getAxisPair().getxAxis().getBounds().getWidth();