diff --git a/mozilla/calendar/base/content/calendar-unifinder.js b/mozilla/calendar/base/content/calendar-unifinder.js
index 650d6d7b765..b5bab17487e 100644
--- a/mozilla/calendar/base/content/calendar-unifinder.js
+++ b/mozilla/calendar/base/content/calendar-unifinder.js
@@ -366,10 +366,14 @@ function unifinderKeyPress(aEvent) {
         case 13:
             // Enter, edit the event
             editSelectedEvents();
+            aEvent.stopPropagation();
+            aEvent.preventDefault();
             break;
         case kKE.DOM_VK_BACK_SPACE:
         case kKE.DOM_VK_DELETE:
             deleteSelectedEvents();
+            aEvent.stopPropagation();
+            aEvent.preventDefault();
             break;
     }
 }
diff --git a/mozilla/calendar/base/content/calendar-views.js b/mozilla/calendar/base/content/calendar-views.js
index 66f2dc5d609..bd8f3f6dc5b 100644
--- a/mozilla/calendar/base/content/calendar-views.js
+++ b/mozilla/calendar/base/content/calendar-views.js
@@ -625,7 +625,8 @@ function getLastCalendarView() {
 }
 
 /**
- *  Deletes items currently selected in the view.
+ *  Deletes items currently selected in the view 
+ *  and clears selection.
  */
 function deleteSelectedEvents() {
     var selectedItems = currentView().getSelectedItems({});
@@ -633,6 +634,8 @@ function deleteSelectedEvents() {
                                              selectedItems,
                                              false,
                                              false);
+    // clear selection
+    currentView().setSelectedItems(0, [], true);
 }
 
 /**