UI: revert changes from 3f630f9 that broke links in PopupMenus