Fix for only direct events on modals