diff --git a/mozilla/calendar/base/content/agenda-listbox.js b/mozilla/calendar/base/content/agenda-listbox.js
index 0237f32ab80..467d2957220 100644
--- a/mozilla/calendar/base/content/agenda-listbox.js
+++ b/mozilla/calendar/base/content/agenda-listbox.js
@@ -204,7 +204,7 @@ agendaListbox.editSelectedItem =
 function editSelectedItem(aEvent) {
     var listItem  = document.getElementById("agenda-listbox").selectedItem;
     if (listItem) {
-        modifyEventWithDialog(getOccurrenceOrParent(listItem.occurrence));
+        modifyEventWithDialog(listItem.occurrence, null, true);
     }
 }
 
@@ -414,7 +414,9 @@ function deleteSelectedItem(aDoNotConfirm) {
 agendaListbox.createOrEditEvent =
 function createOrEditEvent(aEvent) {
     if (aEvent.target instanceof Components.interfaces.nsIDOMXULSelectControlItemElement) {
-        document.getElementById('agenda_edit_event_command').doCommand();
+        if (this.isEventListItem(aEvent.target)) {
+            document.getElementById('agenda_edit_event_command').doCommand();
+        }
     }
     else {
         // Create new event for the date currently displayed in the agenda. Setting