diff --git a/calendar/resources/content/calendar.xul b/calendar/resources/content/calendar.xul
index 080e16555b1..c51b0613456 100644
--- a/calendar/resources/content/calendar.xul
+++ b/calendar/resources/content/calendar.xul
@@ -165,7 +165,6 @@
   <key id="key_cut"              key="&calendar.cut.key;"                observes="cut_command"                 modifiers="accel"/>
   <key id="key_copy"             key="&calendar.copy.key;"               observes="copy_command"                modifiers="accel"/>
   <key id="key_paste"            key="&calendar.paste.key;"              observes="paste_command"               modifiers="accel"/>
-  <key id="delete_key"           keycode="VK_DELETE"                     observes="delete_command_no_confirm"/>
   <key id="key_selectAll"        key="&calendar.selectall.key;"          observes="select_all_command"          modifiers="accel"/>
 
 # calendar.xpi adds shift as an accelerator to these 4 keys so we don't conflict with Seamonkey
@@ -675,6 +674,7 @@
         </hbox>
         <tree id="unifinder-search-results-listbox" flex="1" 
               onselect="unifinderOnSelect( event )"
+              onkeypress="unifinderKeyPress(event)"
               enableColumnDrag="true">
           <treecols id="unifinder-search-results-tree-cols">
             <treecol id="unifinder-search-results-tree-col-title"
diff --git a/calendar/resources/content/unifinder.js b/calendar/resources/content/unifinder.js
index 48b0cca38ba..08b83d7e23f 100644
--- a/calendar/resources/content/unifinder.js
+++ b/calendar/resources/content/unifinder.js
@@ -833,3 +833,16 @@ function focusFirstItemIfNoSelection()
    }
 }
 
+function unifinderKeyPress(aEvent) {
+    const kKE = Components.interfaces.nsIDOMKeyEvent;
+    switch (aEvent.keyCode) {
+        case 13:
+            // Enter, edit the event
+            editEvent();
+            break;
+        case kKE.DOM_VK_BACK_SPACE:
+        case kKE.DOM_VK_DELETE:
+            deleteEventCommand(true);
+            break;
+    }
+}
diff --git a/calendar/sunbird/base/content/calendar-sets.inc b/calendar/sunbird/base/content/calendar-sets.inc
index fbf7bd3b154..1b271964bc5 100644
--- a/calendar/sunbird/base/content/calendar-sets.inc
+++ b/calendar/sunbird/base/content/calendar-sets.inc
@@ -141,7 +141,6 @@
   <key id="key_cut"              key="&calendar.cut.key;"                observes="cut_command"                 modifiers="accel"/>
   <key id="key_copy"             key="&calendar.copy.key;"               observes="copy_command"                modifiers="accel"/>
   <key id="key_paste"            key="&calendar.paste.key;"              observes="paste_command"               modifiers="accel"/>
-  <key id="delete_key"           keycode="VK_DELETE"                     observes="delete_command_no_confirm"/>
   <key id="key_selectAll"        key="&calendar.selectall.key;"          observes="select_all_command"          modifiers="accel"/>
 
   <key id="view_day_key"         key="&calendar.dayView.key;"            observes="day_view_command"            modifiers="accel"/>
diff --git a/calendar/sunbird/base/content/calendar.xul b/calendar/sunbird/base/content/calendar.xul
index 2304e13c23b..c7bdc4ab3db 100644
--- a/calendar/sunbird/base/content/calendar.xul
+++ b/calendar/sunbird/base/content/calendar.xul
@@ -601,6 +601,7 @@
         </hbox>
         <tree id="unifinder-search-results-listbox" flex="1" 
               onselect="unifinderOnSelect( event )"
+              onkeypress="unifinderKeyPress(event)"
               enableColumnDrag="true">
           <treecols id="unifinder-search-results-tree-cols">
             <treecol id="unifinder-search-results-tree-col-title"