Fix for infinite open/close loop for short lived popups when using push

As discussed