Improved keyboard accessibility (#1125)