Fix comment focus logic for new navigator