Fix shift-click behaviour