Fix wonky radio buttons when mapping

Resubmit of PR 1431 to s29.