diff --git a/browser/base/content/browser-places.js b/browser/base/content/browser-places.js
index ea9bbd767b77..f540f8f9a4a5 100644
--- a/browser/base/content/browser-places.js
+++ b/browser/base/content/browser-places.js
@@ -1111,6 +1111,7 @@ let BookmarkingUI = {
     if (aState == "invalid") {
       this.star.setAttribute("disabled", "true");
       this.button.removeAttribute("starred");
+      this.button.setAttribute("buttontooltiptext", "");
     }
     else {
       this.star.removeAttribute("disabled");
@@ -1229,11 +1230,11 @@ let BookmarkingUI = {
 
     if (this._itemIds.length > 0) {
       button.setAttribute("starred", "true");
-      button.setAttribute("tooltiptext", this._starredTooltip);
+      button.setAttribute("buttontooltiptext", this._starredTooltip);
     }
     else {
       button.removeAttribute("starred");
-      button.setAttribute("tooltiptext", this._unstarredTooltip);
+      button.setAttribute("buttontooltiptext", this._unstarredTooltip);
     }
   },
 
diff --git a/browser/base/content/test/browser_bug624734.js b/browser/base/content/test/browser_bug624734.js
index 5af37db488fb..12052f5dac8a 100644
--- a/browser/base/content/test/browser_bug624734.js
+++ b/browser/base/content/test/browser_bug624734.js
@@ -11,7 +11,7 @@ function test() {
   tab.linkedBrowser.addEventListener("load", (function(event) {
     tab.linkedBrowser.removeEventListener("load", arguments.callee, true);
 
-    is(BookmarkingUI.button.getAttribute("tooltiptext"),
+    is(BookmarkingUI.button.getAttribute("buttontooltiptext"),
        BookmarkingUI._unstarredTooltip,
        "Star icon should have the unstarred tooltip text");
 
diff --git a/toolkit/content/widgets/toolbarbutton.xml b/toolkit/content/widgets/toolbarbutton.xml
index 44587e2b94ff..e11c29d1b6df 100644
--- a/toolkit/content/widgets/toolbarbutton.xml
+++ b/toolkit/content/widgets/toolbarbutton.xml
@@ -60,7 +60,7 @@
       <xul:toolbarbutton class="box-inherit toolbarbutton-menubutton-button"
                          anonid="button" flex="1" allowevents="true"
                          xbl:inherits="disabled,crop,image,label,accesskey,command,
-                                       align,dir,pack,orient"/>
+                                       align,dir,pack,orient,tooltiptext=buttontooltiptext"/>
       <xul:dropmarker type="menu-button" class="toolbarbutton-menubutton-dropmarker"
                       xbl:inherits="align,dir,pack,orient,disabled,label,open"/>
     </content>