Handling shift clicking better