diff --git a/src/axisitem.cpp b/src/axisitem.cpp
index a104f7f5..4fe0832b 100644
--- a/src/axisitem.cpp
+++ b/src/axisitem.cpp
@@ -38,23 +38,23 @@ AxisItem::AxisItem(Type type, QGraphicsItem *parent) : QGraphicsItem(parent)
 
 void AxisItem::setRange(const RangeF &range)
 {
+	prepareGeometryChange();
 	_range = range;
 	updateBoundingRect();
-	prepareGeometryChange();
 }
 
 void AxisItem::setSize(qreal size)
 {
+	prepareGeometryChange();
 	_size = size;
 	updateBoundingRect();
-	prepareGeometryChange();
 }
 
 void AxisItem::setLabel(const QString& label)
 {
+	prepareGeometryChange();
 	_label = label;
 	updateBoundingRect();
-	prepareGeometryChange();
 }
 
 void AxisItem::updateBoundingRect()
diff --git a/src/infoitem.cpp b/src/infoitem.cpp
index 00dd1148..1c11ae57 100644
--- a/src/infoitem.cpp
+++ b/src/infoitem.cpp
@@ -65,18 +65,19 @@ void InfoItem::insert(const QString &key, const QString &value)
 	KV kv(key, value);
 	int i;
 
+	prepareGeometryChange();
+
 	if ((i = _list.indexOf(kv)) < 0)
 		_list.append(kv);
 	else
 		_list[i] = kv;
 
 	updateBoundingRect();
-	prepareGeometryChange();
 }
 
 void InfoItem::clear()
 {
+	prepareGeometryChange();
 	_list.clear();
 	updateBoundingRect();
-	prepareGeometryChange();
 }
diff --git a/src/scaleitem.cpp b/src/scaleitem.cpp
index a6c0733b..b4cbb8ea 100644
--- a/src/scaleitem.cpp
+++ b/src/scaleitem.cpp
@@ -114,24 +114,24 @@ void ScaleItem::computeScale()
 
 void ScaleItem::setLatitude(qreal lat)
 {
+	prepareGeometryChange();
 	_lat = lat;
 	computeScale();
 	updateBoundingRect();
-	prepareGeometryChange();
 }
 
 void ScaleItem::setZoom(int z)
 {
+	prepareGeometryChange();
 	_zoom = z;
 	computeScale();
 	updateBoundingRect();
-	prepareGeometryChange();
 }
 
 void ScaleItem::setUnits(enum Units units)
 {
+	prepareGeometryChange();
 	_units = units;
 	computeScale();
 	updateBoundingRect();
-	prepareGeometryChange();
 }
diff --git a/src/sliderinfoitem.cpp b/src/sliderinfoitem.cpp
index b992395c..a435c692 100644
--- a/src/sliderinfoitem.cpp
+++ b/src/sliderinfoitem.cpp
@@ -47,9 +47,9 @@ void SliderInfoItem::paint(QPainter *painter, const QStyleOptionGraphicsItem
 
 void SliderInfoItem::setText(const QString &text)
 {
+	prepareGeometryChange();
 	_text = text;
 	updateBoundingRect();
-	prepareGeometryChange();
 }
 
 void SliderInfoItem::setSide(Side side)
@@ -57,7 +57,7 @@ void SliderInfoItem::setSide(Side side)
 	if (side == _side)
 		return;
 
+	prepareGeometryChange();
 	_side = side;
 	updateBoundingRect();
-	prepareGeometryChange();
 }
diff --git a/src/slideritem.cpp b/src/slideritem.cpp
index 6b5b9499..421b0718 100644
--- a/src/slideritem.cpp
+++ b/src/slideritem.cpp
@@ -52,3 +52,9 @@ void SliderItem::clear()
 	_area = QRectF();
 	setPos(QPointF());
 }
+
+void SliderItem::setArea(const QRectF &area)
+{
+	prepareGeometryChange();
+	_area = area;
+}
diff --git a/src/slideritem.h b/src/slideritem.h
index 5b1ef764..39a45d49 100644
--- a/src/slideritem.h
+++ b/src/slideritem.h
@@ -15,7 +15,7 @@ public:
 	  QWidget *widget);
 
 	const QRectF &area() const {return _area;}
-	void setArea(const QRectF &area) {_area = area;}
+	void setArea(const QRectF &area);
 
 	void clear();