diff --git a/mozilla/suite/common/pref/nsPrefWindow.js b/mozilla/suite/common/pref/nsPrefWindow.js
index 0c9a967dfc1..991bd185d2a 100644
--- a/mozilla/suite/common/pref/nsPrefWindow.js
+++ b/mozilla/suite/common/pref/nsPrefWindow.js
@@ -204,6 +204,8 @@ nsPrefWindow.prototype =
             for( var pageTag in this.wsm.dataManager.pageData )
               {
                 var pageData = this.wsm.dataManager.getPageData( pageTag );
+                if (pageData.initialized)
+                  {
                 for( var elementID in pageData )
                   {
                     var element = this.wsm.contentArea.document.getElementById( elementID );
@@ -244,6 +246,7 @@ nsPrefWindow.prototype =
                       }
                   }
               }
+              }
               this.pref.savePrefFile(null);
           },                        
 
@@ -319,6 +322,7 @@ nsPrefWindow.prototype =
               {
                 window.frames[ this.contentFrame ].Startup();
               }
+            this.wsm.dataManager.pageData[aPageTag].initialized=true;
           },
 
     closeBranches: