diff --git a/toolkit/content/widgets/tree.xml b/toolkit/content/widgets/tree.xml
index 1fc7577289..d177c8ccf7 100644
--- a/toolkit/content/widgets/tree.xml
+++ b/toolkit/content/widgets/tree.xml
@@ -789,6 +789,7 @@
         ]]>
       </handler>
 #endif // XP_MACOSX
+
       <handler event="keydown" keycode="VK_ESCAPE">
         <![CDATA[
           if (this._editingColumn) {
@@ -1534,10 +1535,10 @@
                   popupChild.setAttribute("disabled", "true");
                 columns[currElement.getAttribute("ordinal")] = popupChild;
               });
-              columns.filter(function () { return true; })
-                     .forEach(function (e, i) {
+              columns.filter(function (e, i) {
                         e.setAttribute("colindex", i);
                         aPopup.insertBefore(e, refChild);
+                        return false;
                       });
             }