fix PopupNavigate
Merge branch 'fixPopupNavigate'