diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java
index 13d5eae347..e2d59d2bef 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java	
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java	
@@ -5608,7 +5608,7 @@ String toolTipText (NMTTDISPINFO hdr) {
 			}
 			//TEMPORARY CODE
 			if (isCustomToolTip ()) text = " ";
-			if (text != null) return text;
+			if (text != null) return text.replace("&", "&&");
 		}
 	}
 	return super.toolTipText (hdr);