Yes, that's going to be the easiest way to solve the problems.
the issue is that the page number is not passed to the update page as a part of the query string, so cannot be passed back after the update is complete.
I will log this as a bug in the bug base to have it investigated for a future update.