Fix Cancel in Add Additional Setting
Steps:
- open Add Additional Setting dialog
- select a setting in the middle of the list to edit it
- press Cancel
- open the Add Additional Setting dialog again
- select the setting below the previous one to edit it
Result: sometimes the wrong setting gets edited
Parent Task: #10828 (closed)
Original created by @alant on 11658 (Redmine)