Closes #3509497
Fix for sorting and shift up/down - was totally broken when the target is in the first (or only) region