#19682@wl [BUG] Navigation bar issues