Use focusOnChange
where appropriate
#2364
Open
focusOnChange
where appropriate
#2364