Fix handling of page change after add stuff