Properly repage after trimming

Test Plan: Tested on mini-me