Use a saner (and cheaper) way to pad the selection

Issue #2256