[#1477] modal buttons bug-fix