MDL-43089, tidy up repaginate popup