NAvigation selected state fix