Comment 10 for bug 80023

Full list of revisions that need merging:
- 4686, 4688, 4689, 4690
- 4687 kills a DeprecationWarning, but is not critical otherwise

I'm pretty sure no other views have this bug.

Things that would be good to do, but I've run out of steam to do
- fix Enter triggering an unobvious button in the form