Comment 2 for bug 1714446

I have temporarily removed the <form> elements and replaced them with linked buttons and it seems to resolve the issue.

It isn't a very pretty solution so would welcome any help in making it better / easier to navigate.