Tool-tips remove themselves more reliably

Bug 88:closed