Fixed shift-click behavior