BS-9848 Fix stack when double clicking