Fix up keyboard a11y (bug 1094735, 1099237)

Just testing :+1: