Fix back/next logic for Next enabled state.