                     newRow--;
                     newColumn = columnCount - 1;
                 }
+                else if (arrowKeysWrapFocus && newColumn == 0 && inRows && newRow == 0)
+                {
+                    newRow = rowCount - 1;
+                    newColumn = columnCount - 1;
+                }
                 else
                     newColumn--;
                 break;

                    newColumn = 0;
                    newRow++;
                }
                else
                    newColumn++;
                break;

            
        // Make sure currentIndex is within range
        var inRows:Boolean = orientation == TileOrientation.ROWS;
        currentIndex = Math.max(0, Math.min(maxIndex, currentIndex));

        // Find the current column and row
