Fixed issue in development branch with tooltips not hiding the second time. Closes #1766. Related to #1728.