diff --git a/mozilla/mailnews/base/search/resources/content/FilterListDialog.js b/mozilla/mailnews/base/search/resources/content/FilterListDialog.js
index 09b58c8ee23..4e54938e425 100644
--- a/mozilla/mailnews/base/search/resources/content/FilterListDialog.js
+++ b/mozilla/mailnews/base/search/resources/content/FilterListDialog.js
@@ -164,9 +164,9 @@ function onCancel()
 
 function onFilterServerClick(selection)
 {
-    var itemURI = selection.getAttribute('id');
+    var itemURI = selection.getAttribute('itemUri');
 
-    if (!itemURI || itemURI == gCurrentServerURI)
+    if (itemURI == gCurrentServerURI)
       return;
 
     // Save the current filters to disk before switching because
diff --git a/mozilla/mailnews/base/search/resources/content/FilterListDialog.xul b/mozilla/mailnews/base/search/resources/content/FilterListDialog.xul
index 12bbc91f1f5..4f5fda53f49 100644
--- a/mozilla/mailnews/base/search/resources/content/FilterListDialog.xul
+++ b/mozilla/mailnews/base/search/resources/content/FilterListDialog.xul
@@ -75,20 +75,21 @@
           datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
           sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
           sortDirection="ascending"
-          ref="msgaccounts:/">
+          ref="msgaccounts:/"
+          oncommand="onFilterServerClick(event.target);">
           <template>
             <rule iscontainer="true" isempty="false" nc:ServerType="nntp">
               <menupopup>
                 <menu uri="..." 
-                                oncommand="onFilterServerClick(event.target)"
                                 class="folderMenuItem menu-iconic" 
                                 IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
                                 IsSecure="rdf:http://home.netscape.com/NC-rdf#IsSecure"
                                 ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType"
-                                label="rdf:http://home.netscape.com/NC-rdf#Name">
+                                label="rdf:http://home.netscape.com/NC-rdf#Name"
+                                itemUri="rdf:*">
                   <menupopup class="menulist-menupopup">
                     <menuitem label="&choosethisnewsserver.label;"
-                      oncommand="onFilterServerClick(event.target.parentNode.parentNode)"/>
+                              itemUri="rdf:*"/>
                     <menuseparator/>
                   </menupopup>
                 </menu>
@@ -101,18 +102,19 @@
                  IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
                  IsSecure="rdf:http://home.netscape.com/NC-rdf#IsSecure"
                  ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType"
-                 label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                 label="rdf:http://home.netscape.com/NC-rdf#Name"
+                 itemUri="rdf:*"/>
               </menupopup>
             </rule>
             <rule nc:SupportsFilters="true">
               <menupopup>
                 <menuitem uri="..." value="..."
-                 oncommand="onFilterServerClick(event.target)"
                  class="folderMenuItem menuitem-iconic"
                  IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
                  IsSecure="rdf:http://home.netscape.com/NC-rdf#IsSecure"
                  ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType"
-                 label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                 label="rdf:http://home.netscape.com/NC-rdf#Name"
+                 itemUri="rdf:*"/>
               </menupopup>
             </rule>
           </template>