diff --git a/mailnews/addrbook/resources/content/abCardOverlay.js b/mailnews/addrbook/resources/content/abCardOverlay.js
index d305ea5c7270..61e73f258b00 100644
--- a/mailnews/addrbook/resources/content/abCardOverlay.js
+++ b/mailnews/addrbook/resources/content/abCardOverlay.js
@@ -153,10 +153,24 @@ function EditCardOKButton()
 }
 
 
+function OnNewCardEnter()
+{
+  if (NewCardOKButton()) 
+    window.close();
+}
+
+function OnEditCardEnter()
+{
+  if (EditCardOKButton()) 
+    window.close();
+}
+
 function OnLoadEditCard()
 {
   InitEditCard();
 
+  doSetOKCancel(EditCardOKButton, 0);
+
   editCard.titleProperty = "editCardTitle";
 
   if (window.arguments && window.arguments[0])
diff --git a/mailnews/addrbook/resources/content/abDragDrop.js b/mailnews/addrbook/resources/content/abDragDrop.js
index ca9705754f2c..1829b48cf14f 100644
--- a/mailnews/addrbook/resources/content/abDragDrop.js
+++ b/mailnews/addrbook/resources/content/abDragDrop.js
@@ -140,7 +140,7 @@ var abDirTreeObserver = {
       }
       
       var row = {}, col = {}, obj = {};
-      dirTree.view.treeBoxObject.getCellAt(aEvent.clientX, aEvent.clientY, row, col, obj);
+      dirTree.treeBoxObject.getCellAt(aEvent.clientX, aEvent.clientY, row, col, obj);
       if (row.value >= dirTree.view.rowCount || row.value < 0) return;
       
       var item = dirTree.contentView.getItemAtIndex(row.value);
diff --git a/mailnews/addrbook/resources/content/abEditCardDialog.xul b/mailnews/addrbook/resources/content/abEditCardDialog.xul
index c0b0c3df9eb5..0704246d7ed6 100644
--- a/mailnews/addrbook/resources/content/abEditCardDialog.xul
+++ b/mailnews/addrbook/resources/content/abEditCardDialog.xul
@@ -25,13 +25,19 @@ Rights Reserved.
 <?xul-overlay href="chrome://messenger/content/addressbook/abCardOverlay.xul"?>
 
 
-<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         id="abcardWindow"
-        ondialogaccept="return EditCardOKButton();"
-        onload="OnLoadEditCard()">
+        onload="OnLoadEditCard()"
+        class="dialog">
+
+  <keyset id="editCardDialogKeys">
+    <key keycode="VK_ENTER" oncommand="OnEditCardEnter();"/>
+    <key keycode="VK_RETURN" oncommand="OnEditCardEnter();"/>
+    <key keycode="VK_ESCAPE" oncommand="window.close();"/>
+  </keyset>
 
   <stringbundleset id="stringbundleset"/>
   <vbox id="editcard"/>	
-
-</dialog>
+  <hbox id="okCancelButtons"/>
+</window>
 
diff --git a/mailnews/addrbook/resources/content/abNewCardDialog.xul b/mailnews/addrbook/resources/content/abNewCardDialog.xul
index 121c41c170df..007c5dc0b443 100644
--- a/mailnews/addrbook/resources/content/abNewCardDialog.xul
+++ b/mailnews/addrbook/resources/content/abNewCardDialog.xul
@@ -36,7 +36,11 @@ Rights Reserved.
 
   <stringbundleset id="stringbundleset"/>
 
-  <keyset id="dialogKeys"/>
+  <keyset id="newCardDialogKeys">
+    <key keycode="VK_ENTER" oncommand="OnNewCardEnter();"/>
+    <key keycode="VK_RETURN" oncommand="OnNewCardEnter();"/>
+    <key keycode="VK_ESCAPE" oncommand="window.close();"/>
+  </keyset>
 
   <hbox align="center" valign="center">