diff --git a/src/GUI/routeitem.cpp b/src/GUI/routeitem.cpp
index 201b4423..90e6df99 100644
--- a/src/GUI/routeitem.cpp
+++ b/src/GUI/routeitem.cpp
@@ -50,12 +50,11 @@ void RouteItem::setUnits(Units u)
 	if (units() == u)
 		return;
 
-	PathItem::setUnits(u);
-
 	setToolTip(toolTip(units()));
-
 	for (int i = 0; i < _waypoints.count(); i++)
 		_waypoints[i]->setToolTipFormat(units(), _coordinatesFormat);
+
+	PathItem::setUnits(u);
 }
 
 void RouteItem::setCoordinatesFormat(CoordinatesFormat format)
diff --git a/src/GUI/trackitem.cpp b/src/GUI/trackitem.cpp
index 1ddb3ae8..0ee8a828 100644
--- a/src/GUI/trackitem.cpp
+++ b/src/GUI/trackitem.cpp
@@ -39,6 +39,6 @@ TrackItem::TrackItem(const Track &track, Map *map, QGraphicsItem *parent)
 
 void TrackItem::setUnits(Units units)
 {
-	PathItem::setUnits(units);
 	setToolTip(toolTip(units));
+	PathItem::setUnits(units);
 }