diff --git a/mozilla/xpfe/components/autocomplete/resources/content/autocomplete.xml b/mozilla/xpfe/components/autocomplete/resources/content/autocomplete.xml
index 29efe2aabfb..aa4ddb39596 100644
--- a/mozilla/xpfe/components/autocomplete/resources/content/autocomplete.xml
+++ b/mozilla/xpfe/components/autocomplete/resources/content/autocomplete.xml
@@ -1365,7 +1365,7 @@
   <binding id="autocomplete-internal-box">
     <content context="_child">
       <children/>
-        <xul:menupopup onpopupshowing="this.parentNode.doPopupItemEnabling(this);">
+        <xul:menupopup onpopupshowing="this.parentNode.focus(); this.parentNode.doPopupItemEnabling(this);">
           <xul:menuitem label="&undoCmd.label;" accesskey="&undoCmd.accesskey;" cmd="cmd_undo"
                         oncommand="var controller = document.commandDispatcher.getControllerForCommand('cmd_undo');              
                                    controller.doCommand('cmd_undo');"/>
diff --git a/mozilla/xpfe/global/resources/content/bindings/textbox.xml b/mozilla/xpfe/global/resources/content/bindings/textbox.xml
index 96ee68b071d..5d6ceee583a 100644
--- a/mozilla/xpfe/global/resources/content/bindings/textbox.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/textbox.xml
@@ -19,7 +19,7 @@
       <xul:hbox class="textbox-internal-box" flex="1">
         <html:input class="textbox-input" flex="1" inherits="onfocus,onblur,value,type,maxlength,disabled,size,readonly"/>
       </xul:hbox>
-        <xul:menupopup onpopupshowing="this.parentNode.doPopupItemEnabling(this); this.focus();">
+        <xul:menupopup onpopupshowing="this.parentNode.focus(); this.parentNode.doPopupItemEnabling(this);">
           <xul:menuitem label="&undoCmd.label;" accesskey="&undoCmd.accesskey;" cmd="cmd_undo" oncommand="
             var controller = document.commandDispatcher.getControllerForCommand('cmd_undo');              
             controller.doCommand('cmd_undo');"/>
@@ -76,6 +76,7 @@
                                          if (val) this.setAttribute('disabled', 'true');
                                          else this.removeAttribute('disabled'); return val;"
                                   onget="return this.inputField.readonly;"/>
+                                  
 
       <method name="select">
         <body>
