Similar to the issue in T248381; the scroll position when you choose to go back is not saved in these cases:
Solve similar to how T248381 was resolved.
I can't reproduce this now on the latest branch, can you check again? @Jpita @AMuigai