diff --git a/qml/AppListView.qml b/qml/AppListView.qml
index c8bee229..62a37b9b 100644
--- a/qml/AppListView.qml
+++ b/qml/AppListView.qml
@@ -38,7 +38,7 @@ Item {
             if (character === transliterated1st) {
                 // we use the highlight move to scroll to item
                 listView.highlightMoveDuration = 0
-                listView.highlightRangeMode = ListView.StrictlyEnforceRange
+                listView.highlightRangeMode = ListView.ApplyRange
                 listView.currentIndex = i
                 postScrollDeferTimer.restart()
                 break
@@ -94,8 +94,11 @@ Item {
             if (activeFocus) {
                 // When focus in, we always scroll to the highlight
                 listView.highlightMoveDuration = 0
+                listView.currentIndex = 0
                 listView.highlightRangeMode = ListView.StrictlyEnforceRange
                 postScrollDeferTimer.restart()
+            } else {
+                listView.currentIndex = -1
             }
         }
 
diff --git a/qml/GridViewContainer.qml b/qml/GridViewContainer.qml
index 7df89254..b79fef47 100644
--- a/qml/GridViewContainer.qml
+++ b/qml/GridViewContainer.qml
@@ -77,8 +77,11 @@ FocusScope {
                 onActiveFocusChanged: {
                     if (activeFocus) {
                         gridView.highlightMoveDuration = 0
+                        gridView.currentIndex = 0
                         gridView.highlightRangeMode = GridView.StrictlyEnforceRange
                         postScrollDeferTimer.restart()
+                    } else {
+                        gridView.currentIndex = -1
                     }
                 }
                 cellHeight: item.cellSize