A usability update today: I've gone through all the elements on the page to ensure they all behave as expected when using a keyboard to navigate instead of a mouse. This proved to be a little complex on the pop-up, given that the buttons there are programmatically built, but it's all working nicely now.