Fix customizing shortcuts.

Important accessibility fixes for customizing shortcuts.