diff --git a/qml/GridViewContainer.qml b/qml/GridViewContainer.qml
index 5304e023..c7bfd455 100644
--- a/qml/GridViewContainer.qml
+++ b/qml/GridViewContainer.qml
@@ -130,22 +130,14 @@ FocusScope {
                 moveDisplaced: root.itemMove
 
                 Keys.onPressed: function (event) {
-                    if (event.key === Qt.Key_Left ||
-                        event.key === Qt.Key_Right ||
-                        event.key === Qt.Key_Up ||
-                        event.key === Qt.Key_Down) {
-
-                        if (!keyTimer.running) {
-                            keyTimer.start()
-                        } else {
-                            event.accepted = true
-                        }
+                    if (event.key === Qt.Key_Right && currentIndex === gridView.count - 1) {
+                        gridView.currentIndex = 0;
+                        event.accepted = true;
+                    } else if (event.key === Qt.Key_Left && currentIndex === 0) {
+                        currentIndex = gridView.count - 1;
+                        event.accepted = true;
                     }
                 }
-                Timer {
-                    id: keyTimer
-                    interval: 100
-                }
             }
         }