diff --git a/src/chartdataset.cpp b/src/chartdataset.cpp
index 0155cf7..e5d33c6 100644
--- a/src/chartdataset.cpp
+++ b/src/chartdataset.cpp
@@ -213,12 +213,20 @@ void ChartDataSet::calculateDomain(QSeries* series,Domain* domain) const
         case QSeries::SeriesTypeScatter: {
             QScatterSeries *scatterSeries = qobject_cast<QScatterSeries *>(series);
             Q_ASSERT(scatterSeries);
+            qreal minX(domain->minX());
+            qreal minY(domain->minY());
+            qreal maxX(domain->maxX());
+            qreal maxY(domain->maxY());
             foreach (QPointF point, scatterSeries->data()) {
-                domain->setMinX(qMin(domain->minX(), point.x()));
-                domain->setMinY(qMax(domain->maxX(), point.x()));
-                domain->setMaxX(qMin(domain->minY(), point.y()));
-                domain->setMaxY(qMax(domain->maxY(), point.y()));
+                minX = qMin(minX, point.x());
+                minY = qMin(minY, point.y());
+                maxX = qMax(maxX, point.x());
+                maxY = qMax(maxY, point.y());
             }
+            domain->setMinX(minX);
+            domain->setMinY(minY);
+            domain->setMaxX(maxX);
+            domain->setMaxY(maxY);
             break;
         }
 
diff --git a/src/chartpresenter.cpp b/src/chartpresenter.cpp
index d8db236..908d406 100644
--- a/src/chartpresenter.cpp
+++ b/src/chartpresenter.cpp
@@ -219,9 +219,13 @@ void ChartPresenter::handleSeriesAdded(QSeries* series,Domain* domain)
                          scatterSeries, SIGNAL(clicked(QPointF)));
         QObject::connect(this, SIGNAL(geometryChanged(const QRectF&)),
                          scatterPresenter, SLOT(handleGeometryChanged(const QRectF&)));
+        QObject::connect(domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),
+                         scatterPresenter, SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
         m_chartTheme->decorate(scatterPresenter, scatterSeries, m_chartItems.count());
         m_chartItems.insert(scatterSeries, scatterPresenter);
-        if(m_rect.isValid()) scatterPresenter->handleGeometryChanged(m_rect);
+        if (m_rect.isValid())
+            scatterPresenter->handleGeometryChanged(m_rect);
+        scatterPresenter->handleDomainChanged(domain->minX(), domain->maxX(), domain->minY(), domain->maxY());
         break;
     }
     case QSeries::SeriesTypePie: {
diff --git a/src/scatterseries/scatterpresenter.cpp b/src/scatterseries/scatterpresenter.cpp
index f190417..369f52e 100644
--- a/src/scatterseries/scatterpresenter.cpp
+++ b/src/scatterseries/scatterpresenter.cpp
@@ -18,10 +18,10 @@ ScatterPresenter::ScatterPresenter(QScatterSeries *series, QGraphicsObject *pare
     m_minY(0),
     m_maxY(0),
     m_series(series),
-    m_boundingRect()
+    m_clippingRect()
 {
     if (parent)
-        m_boundingRect = parent->boundingRect();
+        m_clippingRect = parent->boundingRect();
 
     if (series) {
         connect(series, SIGNAL(changed()), this, SLOT(handleModelChanged()));
@@ -38,16 +38,16 @@ ScatterPresenter::ScatterPresenter(QScatterSeries *series, QGraphicsObject *pare
 
 void ScatterPresenter::handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY)
 {
-    m_minX=minX;
-    m_maxX=maxX;
-    m_minY=minY;
-    m_maxY=maxY;
+    m_minX = minX;
+    m_maxX = maxX;
+    m_minY = minY;
+    m_maxY = maxY;
     changeGeometry();
 }
 
 void ScatterPresenter::handleGeometryChanged(const QRectF& rect)
 {
-    m_boundingRect = rect.translated(-rect.topLeft());
+    m_clippingRect = rect.translated(-rect.topLeft());
     changeGeometry();
     setPos(rect.topLeft());
 }
@@ -61,7 +61,7 @@ void ScatterPresenter::handleModelChanged()
 void ScatterPresenter::paint(QPainter *painter, const QStyleOptionGraphicsItem */*option*/, QWidget */*widget*/)
 {
     painter->save();
-    painter->setClipRect(m_boundingRect);
+    painter->setClipRect(m_clippingRect);
 
     // TODO: how to draw a drop shadow?
     // Now using a custom implementation for drop shadow instead of QGraphicsDropShadowEffect.
@@ -104,17 +104,17 @@ void ScatterPresenter::mousePressEvent(QGraphicsSceneMouseEvent *event)
 void ScatterPresenter::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
     QPointF clickedPoint(
-        m_minX + (event->lastPos().x() / m_boundingRect.width()) * (m_maxX-m_minX),
-        m_maxY - (event->lastPos().y() / m_boundingRect.height()) * (m_maxY-m_minY));
+        m_minX + (event->lastPos().x() / m_clippingRect.width()) * (m_maxX-m_minX),
+        m_maxY - (event->lastPos().y() / m_clippingRect.height()) * (m_maxY-m_minY));
     emit clicked(clickedPoint);
 }
 
 void ScatterPresenter::changeGeometry()
 {
-    if (m_boundingRect.isValid()) {
+    if (m_clippingRect.isValid()) {
         prepareGeometryChange();
-        qreal scalex = m_boundingRect.width() / (m_maxX-m_minX);
-        qreal scaley = m_boundingRect.height() / (m_maxY-m_minY);
+        qreal scalex = m_clippingRect.width() / (m_maxX - m_minX);
+        qreal scaley = m_clippingRect.height() / (m_maxY - m_minY);
 
         int shape = m_series->shape();
         m_path = QPainterPath();
@@ -124,7 +124,7 @@ void ScatterPresenter::changeGeometry()
         foreach (QPointF point, m_series->data()) {
             // Convert relative coordinates to absolute pixel coordinates that can be used for drawing
             qreal x = point.x() * scalex - m_minX * scalex - size / 2;
-            qreal y = m_boundingRect.height() - point.y() * scaley + m_minY * scaley - size / 2;
+            qreal y = m_clippingRect.height() - point.y() * scaley + m_minY * scaley - size / 2;
 
             if (x < scene()->width() && y < scene()->height()) {
                 switch (shape) {
diff --git a/src/scatterseries/scatterpresenter_p.h b/src/scatterseries/scatterpresenter_p.h
index ebd4bfa..1e500ff 100644
--- a/src/scatterseries/scatterpresenter_p.h
+++ b/src/scatterseries/scatterpresenter_p.h
@@ -39,7 +39,7 @@ public:
     qreal m_minY;
     qreal m_maxY;
     QScatterSeries *m_series;
-    QRectF m_boundingRect;
+    QRectF m_clippingRect;
     QPen m_markerPen;
     QBrush m_markerBrush;
     QPainterPath m_path;