diff --git a/suite/browser/navigator.js b/suite/browser/navigator.js
index b2dc46a5907f..11f1d7d5c6dd 100644
--- a/suite/browser/navigator.js
+++ b/suite/browser/navigator.js
@@ -1512,3 +1512,34 @@ function updateToolbarStates(toolbarMenuElt)
   updateComponentBarBroadcaster();
 }
 
+// Fill in tooltips for personal toolbar
+function FillInPTTooltip(tipElement)
+{
+
+  var title = tipElement.label;
+  var url = tipElement.statusText;
+
+  if (!title && !url) {
+    // bail out early if there is nothing to show
+    return false;
+  }
+
+  var tooltipTitle = document.getElementById("ptTitleText");
+  var tooltipUrl = document.getElementById("ptUrlText"); 
+
+  if (title && title != url) {
+    tooltipTitle.removeAttribute("hidden");
+    tooltipTitle.setAttribute("value", title);
+  } else  {
+    tooltipTitle.setAttribute("hidden", "true");
+  }
+
+  if (url) {
+    tooltipUrl.removeAttribute("hidden");
+    tooltipUrl.setAttribute("value", url);
+  } else {
+    tooltipUrl.setAttribute("hidden", "true");
+  }
+
+  return true; // show tooltip
+}
diff --git a/suite/browser/navigator.xul b/suite/browser/navigator.xul
index 36f0d242375a..5fa257d5a023 100644
--- a/suite/browser/navigator.xul
+++ b/suite/browser/navigator.xul
@@ -268,6 +268,14 @@ Contributor(s): ______________________________________. -->
            ref="NC:PersonalToolbarFolder" flags="dont-test-empty"
            rdf:type="http://home.netscape.com/NC-rdf#Folder"
            oncommand="OpenBookmarkURL(event.target, document.getElementById('innermostBox').database)">
+
+        <tooltip id="ptTooltip" noautohide="true" onpopupshowing="return FillInPTTooltip(document.tooltipNode)">
+          <vbox id="ptTooltipTextBox" flex="1">  
+            <label id="ptTitleText" />
+            <label id="ptUrlText" />
+          </vbox>
+        </tooltip>
+
         <template>
           <rule parent="hbox" rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
             <toolbarseparator uri="rdf:*"
@@ -307,7 +315,8 @@ Contributor(s): ______________________________________. -->
                            validate="never"
                            status="rdf:http://home.netscape.com/WEB-rdf#status"
                            rdf:type="http://home.netscape.com/NC-rdf#Bookmark"
-                           tooltiptext="rdf:http://home.netscape.com/NC-rdf#URL"
+                           statustext="rdf:http://home.netscape.com/NC-rdf#URL"
+                           tooltip="ptTooltip"
                            label="rdf:http://home.netscape.com/NC-rdf#Name"/>
           </rule>