MDL-20204 fixed regression from button conversion