Fix the pagination issue with up-and-coming themes (bug 944096)

I'm of course open to all suggestions.