Fix button selectors
This should really fix this nonsense
Merge pull request #3299 from yakky/feature/fix_form_selector

Fix modal button selectors (again!)