[#57588044] Trying to fix some history issues on modal with events