diff --git a/mozilla/browser/components/prefwindow/content/pref-features.js b/mozilla/browser/components/prefwindow/content/pref-features.js
index cc1baf8a68b..c4ce3c72bff 100644
--- a/mozilla/browser/components/prefwindow/content/pref-features.js
+++ b/mozilla/browser/components/prefwindow/content/pref-features.js
@@ -337,7 +337,6 @@ function HandlePermissionKeyPress(e) {
 
 function showFontsAndColors()
 {
-  top.hPrefWindow.registerOKCallbackFunc(saveFontPrefs);
   openDialog("chrome://browser/content/pref/pref-fonts.xul", "", "centerscreen,chrome,modal=yes,dialog=yes");
 }
 
diff --git a/mozilla/browser/components/prefwindow/content/pref-fonts.js b/mozilla/browser/components/prefwindow/content/pref-fonts.js
index 819685f21c1..46105bbbf3a 100644
--- a/mozilla/browser/components/prefwindow/content/pref-fonts.js
+++ b/mozilla/browser/components/prefwindow/content/pref-fonts.js
@@ -256,8 +256,8 @@ function Startup()
   
 function onFontsDialogOK()
   {
-    window.opener.top.hPrefWindow.wsm.savePageData(window.location.href, window);
-    
+    gPrefWindow.registerOKCallbackFunc(window.opener.saveFontPrefs);
+    gPrefWindow.wsm.savePageData(window.location.href, window);
     return true;
   }