Make ctrl-double/triple-click work again

Issue #2997