Previously, left/right arrows didn't work and up/down arrows went left and right (cherry picked from commit 06d75383)