Fix navigation selection bug