fix: #1474 improve form state updates

[deandreamatias]

Connection with issue(s)

Close #1474

Solution description

Screenshots or Videos

To Do

• [ ] Read contributing guide
• [ ] Check the original issue to confirm it is fully satisfied
• [ ] Add solution description to help guide reviewers
• [ ] Add unit test to verify new or fixed behaviour
• [ ] If apply, add documentation to code properties and package readme