diff --git a/interface/resources/qml/hifi/tablet/Tablet.qml b/interface/resources/qml/hifi/tablet/Tablet.qml
index db8b595135..9ca230b577 100644
--- a/interface/resources/qml/hifi/tablet/Tablet.qml
+++ b/interface/resources/qml/hifi/tablet/Tablet.qml
@@ -222,9 +222,10 @@ Item {
     }
     function nextItem() {
         setCurrentItemState("base state");
-
-        if((rowIndex + columnIndex) != count) {
-            columnIndex = (columnIndex + 3 + 1) % 3
+        var nextColumnIndex = (columnIndex + 3 + 1) % 3;
+        var nextIndex = rowIndex + nextColumnIndex;
+        if(nextIndex <= count) {
+            columnIndex = nextColumnIndex;
         };
         setCurrentItemState("hover state");
     }