Fixed next page when in app mode handling the watch state properly.