Expand selection after indenting

See #2705 for discussion.