This fixes the regression and adds the ability to navigate between buttons with the arrow keys.
BUG: 453591
