Fix up shift-clicking a bit more