Fix navigation click issue