diff --git a/xpfe/components/prefwindow/resources/content/pref-cache.xul b/xpfe/components/prefwindow/resources/content/pref-cache.xul
index 890070afc26..83ac1ba1cc5 100644
--- a/xpfe/components/prefwindow/resources/content/pref-cache.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-cache.xul
@@ -38,6 +38,15 @@
   <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["browserCacheDiskCache", "browserCacheCheckDocFrequency", "enablePrefetch"];
+    function GetFields(pageData) {
+      // because the cache is in kilobytes, and the UI is in megabytes.
+      pageData.browserCacheDiskCache.value <<= 10;
+      return null;
+    }
+    function SetFields(pageData) {
+      pageData.browserCacheDiskCache.value >>= 10;
+      return true;
+    }
   ]]>
   </script>
   
@@ -52,9 +61,9 @@
 
     <hbox align="center">
       <label value="&diskCache.label;" accesskey="&diskCache.accesskey;" control="browserCacheDiskCache"/>
-      <textbox id="browserCacheDiskCache" size="8" preftype="int"
+      <textbox id="browserCacheDiskCache" size="5" preftype="int"
                   prefstring="browser.cache.disk.capacity" prefattribute="value"/>
-      <label value="&kbytes;"/>
+      <label value="&mbytes;"/>
       <button label="&clearDiskCache.label;" accesskey="&clearDiskCache.accesskey;"
               oncommand="prefClearDiskAndMemCache();"
               id="clearDiskCache"
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-cache.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-cache.dtd
index ff1e73707ff..100666e0768 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-cache.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-cache.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  cachePara                     "The cache keeps copies of frequently visited web pages on your hard disk. (Clicking Reload always shows you the latest version of a page.)">
 <!ENTITY  diskCache.label               "Cache:">
 <!ENTITY  diskCache.accesskey           "C">
-<!ENTITY  kbytes                        "KB">
+<!ENTITY  mbytes                        "MB">
 <!ENTITY  diskCacheFolder.label         "Cache Folder:">
 <!ENTITY  clearDiskCache.label          "Clear Cache">
 <!ENTITY  clearDiskCache.accesskey      "l">
diff --git a/xpfe/global/resources/content/nsWidgetStateManager.js b/xpfe/global/resources/content/nsWidgetStateManager.js
index f0f9dba32f9..469bc74180a 100644
--- a/xpfe/global/resources/content/nsWidgetStateManager.js
+++ b/xpfe/global/resources/content/nsWidgetStateManager.js
@@ -110,13 +110,6 @@ nsWidgetStateManager.prototype =
           if (!(aPageTag in this.dataManager.pageData))
             return;
 
-          if( 'GetFields' in this.contentArea)
-            {
-              // save page data based on user supplied function in content area
-              var dataObject = this.contentArea.GetFields();
-              if (dataObject)
-                this.dataManager.setPageData( aPageTag, dataObject );
-            }
 
             // Automatic element retrieval. This is done in two ways.
             // 1) if an element id array is present in the document, this is
@@ -157,6 +150,14 @@ nsWidgetStateManager.prototype =
                                 this.handlers.default_handler.get;
                 this.dataManager.setItemData( aPageTag, elementID, get_Func( elementID ) );
               }
+           if( 'GetFields' in this.contentArea)
+             {
+               // save page data based on user supplied function in content area
+               var dataObject = this.dataManager.getPageData( aPageTag );
+               dataObject = this.contentArea.GetFields( dataObject );
+               if (dataObject)
+                 this.dataManager.setPageData( aPageTag, dataObject );
+             }
         },
 
     setPageData: