[Forms][fix] option not being selected

It seems that I left some code in #1152 while looking for a proper fix. This seems to fix it at least for me. This also fixes #1245.
Merge pull request #1263 from mvrhov/patch-3

[Forms][fix] option not being selected