diff --git a/qt-mobile/qml/DiveDetails.qml b/qt-mobile/qml/DiveDetails.qml
index 77d52c77e..bf07d4571 100644
--- a/qt-mobile/qml/DiveDetails.qml
+++ b/qt-mobile/qml/DiveDetails.qml
@@ -75,8 +75,8 @@ MobileComponents.Page {
 	}
 
 	function showDiveIndex(index) {
-		diveDetailsListView.currentIndex = index;
-		diveDetailsListView.positionViewAtIndex(diveDetailsListView.currentIndex, ListView.Beginning);
+		currentIndex = index;
+		diveDetailsListView.positionViewAtIndex(index, ListView.Beginning);
 	}
 	onWidthChanged: diveDetailsListView.positionViewAtIndex(diveDetailsListView.currentIndex, ListView.Beginning);
 
diff --git a/qt-mobile/qml/DiveList.qml b/qt-mobile/qml/DiveList.qml
index 12fc99182..1429d6776 100644
--- a/qt-mobile/qml/DiveList.qml
+++ b/qt-mobile/qml/DiveList.qml
@@ -23,7 +23,7 @@ MobileComponents.Page {
 
 			// When clicked, the mode changes to details view
 			onClicked: {
-				diveListView.currentIndex = model.index
+				diveListView.currentIndex = index
 				detailsWindow.showDiveIndex(index);
 				stackView.push(detailsWindow);
 			}