dev/fix-follow-selection

Brought to my attention by josh2 and igor- on IRC.