uniformize the way edit tooltips are shown and hidden

fixes #2340

(sorry for the noise)