fix next/prev change navigation (IDEADEV-23628)