diff --git a/suite/common/pref/nsPrefWindow.js b/suite/common/pref/nsPrefWindow.js
index bc749803532a..b2629176658f 100644
--- a/suite/common/pref/nsPrefWindow.js
+++ b/suite/common/pref/nsPrefWindow.js
@@ -33,7 +33,7 @@ function initPanel ( aPrefTag )
       hPrefWindow.onpageload( aPrefTag )
     else {
       dump("*** queueing up a panel...\n");
-      queuedTag = aPrefTag;
+      window.queuedTag = aPrefTag;
     }
   } 
  
@@ -275,7 +275,7 @@ nsPrefWindow.prototype =
       onpageload: 
         function ( aPageTag )
           {
-            if( !this.wsm.dataManager.pageData[aPageTag] )
+            if( !(aPageTag in this.wsm.dataManager.pageData) )
               {
                 var prefElements = window.frames[this.contentFrame].document.getElementsByAttribute( "pref", "true" );
                 this.wsm.dataManager.pageData[aPageTag] = [];
@@ -313,7 +313,7 @@ nsPrefWindow.prototype =
               }      
             this.wsm.setPageData( aPageTag );  // do not set extra elements, accept hard coded defaults
             
-            if( window.frames[ this.contentFrame ].Startup )
+            if( 'Startup' in window.frames[ this.contentFrame ])
               {
                 window.frames[ this.contentFrame ].Startup();
               }
diff --git a/suite/common/pref/pref-navigator.xul b/suite/common/pref/pref-navigator.xul
index 75eb3c44ab4c..878cbf71ed2c 100644
--- a/suite/common/pref/pref-navigator.xul
+++ b/suite/common/pref/pref-navigator.xul
@@ -39,8 +39,10 @@
   </script>
   <script language="JavaScript">
   <![CDATA[
-    _elementIDs = ["startupPage", "browserStartupHomepage", "alwaysCheckWhenDropOnHome", "bookmarksButton", "goButton",
-                   "homeButton", "printButton", "searchButton" ];
+    var _elementIDs = ["startupPage", "browserStartupHomepage", 
+                       "alwaysCheckWhenDropOnHome", "bookmarksButton",
+                       "goButton", "homeButton", "printButton",
+                       "searchButton" ];
   ]]>
   </script>