Fix weirdness with attachment reorder and scroll