Fix regression around dbl and tpl- clicking