Improved shift-click behavior