diff --git a/source/Ox.UI/js/Calendar/Ox.ListCalendar.js b/source/Ox.UI/js/Calendar/Ox.ListCalendar.js
index c7083287..8b5e8d93 100644
--- a/source/Ox.UI/js/Calendar/Ox.ListCalendar.js
+++ b/source/Ox.UI/js/Calendar/Ox.ListCalendar.js
@@ -269,6 +269,7 @@ Ox.ListCalendar = function(options, self) {
             return !!event.type;
         }),
         height: self.options.height,
+        selected: self.options.selected,
         showControls: self.options.showControls,
         showToolbar: true,
         showZoombar: true,
diff --git a/source/Ox.UI/js/Video/Ox.AnnotationPanel.js b/source/Ox.UI/js/Video/Ox.AnnotationPanel.js
index 6a215e27..e14b296c 100644
--- a/source/Ox.UI/js/Video/Ox.AnnotationPanel.js
+++ b/source/Ox.UI/js/Video/Ox.AnnotationPanel.js
@@ -288,7 +288,7 @@ Ox.AnnotationPanel = function(options, self) {
                     });
                 } else if (data.id == 'manage') {
                     that.triggerEvent('define', {
-                        id: self.options.selected,
+                        id: getAnnotation(self.options.selected)[type].id,
                         type: type
                     });
                 } else if (data.id == 'save') {