Issue #5: arrow keys moved back to where they started