diff --git a/mozilla/xpfe/global/resources/content/bindings/dialog.xml b/mozilla/xpfe/global/resources/content/bindings/dialog.xml
index aa7c39455a5..16721f4d080 100644
--- a/mozilla/xpfe/global/resources/content/bindings/dialog.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/dialog.xml
@@ -202,10 +202,10 @@
       <method name="_hitEnter">
         <body>
         <![CDATA[
-          // if a dialog button is focused, do nothing, since its oncommand
-          // will fire, causing the _doButtonCommand to be called naturally
+          // if a button is focused, do nothing, so that activating the button 
+          // doesn't cause the dialog to exit
           var focused = document.commandDispatcher.focusedElement;
-          if (focused && focused.localName == "button" && focused.hasAttribute("dlgtype"))
+          if (focused && focused.localName == "button")
             return;
             
           // only accept dialog if accept button is the default
