Improved keyboard support for modals
Oops, that hasn't worked for a long time