Fix firefox popovers

Branches off #597