diff --git a/mozilla/xpfe/global/resources/content/bindings/popup.xml b/mozilla/xpfe/global/resources/content/bindings/popup.xml
index 549ec045569..f899c5559a0 100644
--- a/mozilla/xpfe/global/resources/content/bindings/popup.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/popup.xml
@@ -141,21 +141,20 @@
 
       <handler event="popupshowing" phase="target">
         <![CDATA[
-          // XXX Remove when phase="target" works
-          if (event.target != this)
-            return;
           var array = [];
           var width = 0;
           for (var menuitem = this.firstChild; menuitem; menuitem = menuitem.nextSibling) {
-            var accel = document.getAnonymousElementByAttribute(menuitem, "anonid", "accel");
-            if (accel && accel.label && accel.boxObject) {
-              array.push(accel);
-              if (accel.boxObject.width > width)
-                width = accel.boxObject.width;
+            if (menuitem.localName == "menuitem" && menuitem.hasAttribute("acceltext")) {
+              var accel = document.getAnonymousElementByAttribute(menuitem, "anonid", "accel");
+              if (accel && accel.boxObject) {
+                array.push(accel);
+                if (accel.boxObject.width > width)
+                  width = accel.boxObject.width;
+              }
             }
           }
           for (var i = 0; i < array.length; i++)
-            array[i].setAttribute("width", width);
+            array[i].width = width;
         ]]>
       </handler>
     </handlers>