[#47768501] DRY up popup menus