diff --git a/map-widget/qml/MapWidget.qml b/map-widget/qml/MapWidget.qml
index fb5545e88..8116163cf 100644
--- a/map-widget/qml/MapWidget.qml
+++ b/map-widget/qml/MapWidget.qml
@@ -56,7 +56,7 @@ Item {
 				anchorPoint.x: 0
 				anchorPoint.y: mapItemImage.height
 				coordinate:  model.coordinate
-				z: mapHelper.model.isSelected(model.divesite) ? mapHelper.model.count - 1 : 0
+				z: model.z
 				sourceItem: Image {
 					id: mapItemImage
 					source: model.pixmap
diff --git a/qt-models/maplocationmodel.cpp b/qt-models/maplocationmodel.cpp
index 10d983575..4ca4a3a53 100644
--- a/qt-models/maplocationmodel.cpp
+++ b/qt-models/maplocationmodel.cpp
@@ -14,6 +14,7 @@ const char *MapLocation::PROPERTY_NAME_COORDINATE = "coordinate";
 const char *MapLocation::PROPERTY_NAME_DIVESITE   = "divesite";
 const char *MapLocation::PROPERTY_NAME_NAME       = "name";
 const char *MapLocation::PROPERTY_NAME_PIXMAP     = "pixmap";
+const char *MapLocation::PROPERTY_NAME_Z          = "z";
 
 #define MIN_DISTANCE_BETWEEN_DIVE_SITES_M 50.0
 
@@ -51,6 +52,8 @@ QVariant MapLocation::getRole(int role) const
 		return m_selected ? QString("qrc:///dive-location-marker-selected-icon") :
 		       inEditMode() ? QString("qrc:///dive-location-marker-inactive-icon") :
 				    QString("qrc:///dive-location-marker-icon");
+	case Roles::RoleZ:
+		return m_selected ? 1 : 0;
 	default:
 		return QVariant();
 	}
@@ -88,6 +91,7 @@ MapLocationModel::MapLocationModel(QObject *parent) : QAbstractListModel(parent)
 	m_roles[MapLocation::Roles::RoleCoordinate] = MapLocation::PROPERTY_NAME_COORDINATE;
 	m_roles[MapLocation::Roles::RoleName] = MapLocation::PROPERTY_NAME_NAME;
 	m_roles[MapLocation::Roles::RolePixmap] = MapLocation::PROPERTY_NAME_PIXMAP;
+	m_roles[MapLocation::Roles::RoleZ] = MapLocation::PROPERTY_NAME_Z;
 	connect(&diveListNotifier, &DiveListNotifier::diveSiteChanged, this, &MapLocationModel::diveSiteChanged);
 }
 
diff --git a/qt-models/maplocationmodel.h b/qt-models/maplocationmodel.h
index 3335822e2..4b2066186 100644
--- a/qt-models/maplocationmodel.h
+++ b/qt-models/maplocationmodel.h
@@ -22,6 +22,7 @@ public:
 	static const char *PROPERTY_NAME_DIVESITE;
 	static const char *PROPERTY_NAME_NAME;
 	static const char *PROPERTY_NAME_PIXMAP;
+	static const char *PROPERTY_NAME_Z;
 
 	explicit MapLocation();
 	explicit MapLocation(struct dive_site *ds, QGeoCoordinate coord, QString name, bool selected);
@@ -37,7 +38,8 @@ public:
 		RoleDivesite = Qt::UserRole + 1,
 		RoleCoordinate,
 		RoleName,
-		RolePixmap
+		RolePixmap,
+		RoleZ
 	};
 
 private: