still trying to fix modal

[#64172798] WIP