diff --git a/qml/AppUI/FullScreenContent.qml b/qml/AppUI/FullScreenContent.qml
index 06de44c..f61109f 100644
--- a/qml/AppUI/FullScreenContent.qml
+++ b/qml/AppUI/FullScreenContent.qml
@@ -389,6 +389,17 @@ RowLayout {
                     }
                 }
 
+                onContentYChanged: {
+                    if (contentYAnimation.running) {
+                        return
+                    }
+                    if ((contentY + height) === contentHeight) {
+                        labelListView.currentIndex = labelRepeater.count - 1
+                        return
+                    }
+                    labelListView.currentIndex = labelColumn.childAt(contentX,contentY).labelIndex
+                }
+
                 NumberAnimation {
                     id: contentYAnimation
                     target: labelViewFlickable