Make vertical motion collapse selection when one exists

Closes #2042