Comment 14 for bug 1836673

Definitely helps, but that /really/ makes it look like the bug that was fixed (it's firing the same assert that the clickHandler is already set because we re-entered the picker tool).