Fixes to match new closing event behavior for Dialog