diff --git a/mozilla/toolkit/content/widgets/textbox.xml b/mozilla/toolkit/content/widgets/textbox.xml
index 57d343fa5ec..168edc625d5 100644
--- a/mozilla/toolkit/content/widgets/textbox.xml
+++ b/mozilla/toolkit/content/widgets/textbox.xml
@@ -98,7 +98,7 @@
       <handler event="focus" phase="capturing">
         <![CDATA[
           if (!this.hasAttribute('focused')) {
-            if (document.commandDispatcher.focusedElement != this.inputField) 
+            if (event.originalTarget != this.inputField)
               this.inputField.focus();
             this.setAttribute('focused','true');
           }
diff --git a/mozilla/xpfe/global/resources/content/bindings/textbox.xml b/mozilla/xpfe/global/resources/content/bindings/textbox.xml
index 57d343fa5ec..168edc625d5 100644
--- a/mozilla/xpfe/global/resources/content/bindings/textbox.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/textbox.xml
@@ -98,7 +98,7 @@
       <handler event="focus" phase="capturing">
         <![CDATA[
           if (!this.hasAttribute('focused')) {
-            if (document.commandDispatcher.focusedElement != this.inputField) 
+            if (event.originalTarget != this.inputField)
               this.inputField.focus();
             this.setAttribute('focused','true');
           }