Improvements to reveal widget popup handling