diff --git a/ChangeLog b/ChangeLog
index 0eff17447..d6659d6e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-04-14  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/WebServerResources/SchedulerUI.js (onDocumentKeydown): new
+	callback method for handling keypresses. Initial code handles
+	event/task deletion.
+
 	* UI/WebServerResources/generic.js (onRowClick): fixed a typo.
 
 2010-04-13  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index d0bb06509..abce95983 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -2550,6 +2550,17 @@ function drawNowLine () {
   }
 }
 
+function onDocumentKeydown(event) {
+    var target = Event.element(event);
+    if (target.tagName != "INPUT") {
+        if (event.keyCode == Event.KEY_DELETE
+            || (event.keyCode == Event.KEY_BACKSPACE && isMac())) {
+            deleteEvent();
+            Event.stop(event);
+        }
+    }
+}
+
 function initCalendars() {
     sorting["attribute"] = "start";
     sorting["ascending"] = true;
@@ -2572,6 +2583,11 @@ function initCalendars() {
         // Calendar import form
         $("uploadCancel").observe("click", hideCalendarImport);
         $("uploadOK").observe("click", hideImportResults);
+
+        if (Prototype.Browser.Gecko)
+            Event.observe(document, "keypress", onDocumentKeydown); // for FF2
+        else
+            Event.observe(document, "keydown", onDocumentKeydown);
     }
 
     onWindowResize.defer();