diff --git a/mozilla/browser/base/content/browser.js b/mozilla/browser/base/content/browser.js
index 9abe8784517..866a64ef043 100644
--- a/mozilla/browser/base/content/browser.js
+++ b/mozilla/browser/base/content/browser.js
@@ -2878,6 +2878,7 @@ function updateHomeTooltip()
   var homeButton = document.getElementById("home-button");
   if (homeButton) {
     var homePage = getHomePage();
+    homePage = homePage.replace(/\|/g,', ');
     homeButton.setAttribute("tooltiptext", homePage);
   }
 }
diff --git a/mozilla/browser/components/prefwindow/content/pref-navigator.js b/mozilla/browser/components/prefwindow/content/pref-navigator.js
index 61c24db6af3..729e02adf42 100644
--- a/mozilla/browser/components/prefwindow/content/pref-navigator.js
+++ b/mozilla/browser/components/prefwindow/content/pref-navigator.js
@@ -83,6 +83,21 @@ function setHomePageToDefaultPage()
   homePageField.value = url;
 }
 
+function onOK() {
+  if (!('homepage' in parent)) return;
+
+  // Replace pipes with commas to look nicer.
+  parent.homepage = parent.homepage.replace(/\|/g,', ');
+  
+  try {
+    // Update the home button tooltip.
+    top.opener.document.getElementById("home-button").setAttribute("tooltiptext", parent.homepage);
+  }
+  catch(ex) {
+    // Maybe we opened prefs from somewhere else
+  }
+}
+
 function Startup()
 {  
   if (top.opener) {
@@ -94,5 +109,6 @@ function Startup()
       useButton.label = useButton.getAttribute("label2");
     }
   }
+  parent.hPrefWindow.registerOKCallbackFunc(onOK);
 }
       
diff --git a/mozilla/browser/components/prefwindow/content/pref-navigator.xul b/mozilla/browser/components/prefwindow/content/pref-navigator.xul
index 8387800175b..f328cbe1e24 100644
--- a/mozilla/browser/components/prefwindow/content/pref-navigator.xul
+++ b/mozilla/browser/components/prefwindow/content/pref-navigator.xul
@@ -201,7 +201,7 @@
     <hbox align="center" flex="1">
       <label value="&location.label;" accesskey="&location.accesskey;" control="browserStartupHomepage"/>
       <textbox id="browserStartupHomepage" type="autocomplete" class="padded" flex="1" 
-               autocompletesearch="history"
+               autocompletesearch="history" oninput="parent.homepage = this.value;"
                preftype="localizedstring"
                prefstring="browser.startup.homepage"/>  <!-- we may wish to change this to data
                                                when we support fancy formatted local filenames -->