--- old/modules/web/src/main/java/com/sun/javafx/webkit/WebPageClientImpl.java	2016-06-28 11:09:06.560659999 +0530
+++ new/modules/web/src/main/java/com/sun/javafx/webkit/WebPageClientImpl.java	2016-06-28 11:09:06.328775999 +0530
@@ -83,6 +83,7 @@
 
     private Tooltip  tooltip;
     private boolean  isTooltipRegistered = false;
+    String oldTooltipText = "";
     @Override public void setTooltip(final String tooltipText) {
         WebView view = accessor.getView();
         if (tooltipText != null) {
@@ -90,7 +91,12 @@
                 tooltip = new Tooltip(tooltipText);
             } else {
                 tooltip.setText(tooltipText);
+                if (!oldTooltipText.equals(tooltipText)) {
+                    Tooltip.uninstall(view, tooltip);
+                    isTooltipRegistered = false;
+                }
             }
+            oldTooltipText = tooltipText;
             if (!isTooltipRegistered) {
                 Tooltip.install(view, tooltip);
                 isTooltipRegistered = true;