diff --git a/mozilla/browser/base/content/browser.js b/mozilla/browser/base/content/browser.js
index 5324b5a789d..578e32249da 100644
--- a/mozilla/browser/base/content/browser.js
+++ b/mozilla/browser/base/content/browser.js
@@ -2529,7 +2529,8 @@ function FillInHTMLTooltip(tipElement)
   for (var i = 0; i < texts.length; ++i) {
     var t = texts[i];
     if (t && t.search(/\S/) >= 0) {
-      tipNode.setAttribute("label", t);
+      // XXX - Short-term fix to bug 67127: collapse whitespace here
+      tipNode.setAttribute("label", t.replace(/\s+/g, " ") );
       retVal = true;
     }
   }
diff --git a/mozilla/xpfe/browser/resources/content/browser.js b/mozilla/xpfe/browser/resources/content/browser.js
index a113eeb1d4a..99e8a93b5a8 100644
--- a/mozilla/xpfe/browser/resources/content/browser.js
+++ b/mozilla/xpfe/browser/resources/content/browser.js
@@ -266,7 +266,8 @@ function FillInHTMLTooltip(tipElement)
   for (var i = 0; i < texts.length; ++i) {
     var t = texts[i];
     if (t && t.search(/\S/) >= 0) {
-      tipNode.setAttribute("label", t);
+      // XXX - Short-term fix to bug 67127: collapse whitespace here
+      tipNode.setAttribute("label", t.replace(/\s+/g, " ") );
       retVal = true;
     }
   }