diff --git a/calendar/resources/content/calendarSelection.js b/calendar/resources/content/calendarSelection.js
index 9c7f10362dc5..216a4c4566d9 100644
--- a/calendar/resources/content/calendarSelection.js
+++ b/calendar/resources/content/calendarSelection.js
@@ -84,7 +84,7 @@ CalendarEventSelection.prototype.removeObserver = function calSel_removeObserver
 
 CalendarEventSelection.prototype.addToSelection = function calSel_addToSelection( Event )
 {
-   this.selectedEvents[ this.selectedEvents.length ] = Event.parentItem;
+   this.selectedEvents[ this.selectedEvents.length ] = Event;
 
    this.onSelectionChanged();
 }
@@ -93,7 +93,7 @@ CalendarEventSelection.prototype.replaceSelection = function calSel_replaceSelec
 {
    this.selectedEvents = new Array();
 
-   this.selectedEvents[ this.selectedEvents.length ] = Event.parentItem;
+   this.selectedEvents[ this.selectedEvents.length ] = Event;
 
    this.onSelectionChanged();
    
@@ -112,7 +112,7 @@ CalendarEventSelection.prototype.setArrayToSelection = function calSel_setArrayT
 
    for( var i = 0; i < ArrayOfEvents.length; i++ )
    {
-      this.selectedEvents[ this.selectedEvents.length ] = ArrayOfEvents[i].parentItem;
+      this.selectedEvents[ this.selectedEvents.length ] = ArrayOfEvents[i];
    }
    
    this.onSelectionChanged();
@@ -123,7 +123,7 @@ CalendarEventSelection.prototype.isSelectedEvent = function calSel_isSelectedEve
 {
    for( var i = 0; i < this.selectedEvents.length; i++ )
    {
-      if( this.selectedEvents[i] == Event.parentItem )
+      if( this.selectedEvents[i] == Event )
          return true;
    }
    return false;
diff --git a/calendar/resources/content/unifinder.js b/calendar/resources/content/unifinder.js
index dd3607a72b4c..35b27c34d3c3 100644
--- a/calendar/resources/content/unifinder.js
+++ b/calendar/resources/content/unifinder.js
@@ -248,7 +248,7 @@ function unifinderDoubleClickEvent( event )
    var calendarEvent = getCalendarEventFromEvent( event );
    
    if( calendarEvent != null )
-      editEvent( calendarEvent.parentItem );
+      editEvent(calendarEvent);
    else
       newEvent();
 }