Re-add support for ctrl-click