diff --git a/qml/FullscreenFrame.qml b/qml/FullscreenFrame.qml
index 68707f10..cd2d485c 100644
--- a/qml/FullscreenFrame.qml
+++ b/qml/FullscreenFrame.qml
@@ -510,6 +510,9 @@ InputEventItem {
                                     return
                                 }
 
+                                listviewPage.changedByNonKeyboard = false
+                                listviewPage.previousIndex = listItem.viewIndex
+
                                 if (listItem.viewIndex === 0) {
                                     // is the 1st page, go to last page
                                     listviewPage.setCurrentIndex(pageCount - 1)
@@ -538,6 +541,8 @@ InputEventItem {
                                     return
                                 }
 
+                                listviewPage.changedByNonKeyboard = false
+
                                 if (listItem.viewIndex === (pageCount - 1) && pageCount > 1) {
                                     // is the last page, go to first page
                                     // mark this as a "next page" switch so that checkPageSwitchState