diff --git a/source/Ox.UI/js/Video/Ox.AnnotationPanel.js b/source/Ox.UI/js/Video/Ox.AnnotationPanel.js
index 37d573fb..61b4280d 100644
--- a/source/Ox.UI/js/Video/Ox.AnnotationPanel.js
+++ b/source/Ox.UI/js/Video/Ox.AnnotationPanel.js
@@ -96,7 +96,10 @@ Ox.AnnotationPanel = function(options, self) {
                     that.triggerEvent('edit');
                 },
                 select: selectAnnotation,
-                submit: submitAnnotation
+                submit: submitAnnotation,
+                key_space: function() {
+                    that.triggerEvent('paused');
+                }
             });
     }
     self.$annotations.appendTo(that.$content);
diff --git a/source/Ox.UI/js/Video/Ox.VideoEditor.js b/source/Ox.UI/js/Video/Ox.VideoEditor.js
index a91dbbe0..b382b192 100644
--- a/source/Ox.UI/js/Video/Ox.VideoEditor.js
+++ b/source/Ox.UI/js/Video/Ox.VideoEditor.js
@@ -383,6 +383,7 @@ Ox.VideoEditor = function(options, self) {
                     self.editing = true;
                     setTimelineState();
                 },
+                paused: togglePaused,
                 remove: function(data) {
                     that.triggerEvent('removeannotation', {
                         id: data.id,
@@ -396,6 +397,8 @@ Ox.VideoEditor = function(options, self) {
                                 self.$annotationPanel[i_].options({selected: ''});
                             }
                         });
+                    } else {
+                        that.gainFocus();
                     }
                     selectAnnotation(data);
                 },
@@ -738,8 +741,9 @@ Ox.VideoEditor = function(options, self) {
 
     self.$editMenuButton = Ox.MenuButton({
             items: [
-                {id: 'edit', title: 'Edit Selected Annotation', disabled: !self.options.selected, keyboard: 'return'},
-                {id: 'delete', title: 'Delete Selected Annotation', disabled: !self.options.selected, keyboard: 'delete'},
+                {id: 'edit', title: 'Edit Annotation', disabled: !self.options.selected, keyboard: 'return'},
+                {id: 'delete', title: 'Delete Annotation', disabled: !self.options.selected, keyboard: 'delete'},
+                {id: 'deselect', title: 'Deselect Annotation', disabled: !self.options.selected, keyboard: 'escape'},
                 {},
                 {id: 'save', title: 'Save Changes', disabled: true, keyboard: 'shift return'},
                 {id: 'undo', title: 'Undo Changes', disabled: true, keyboard: 'escape'}
@@ -1290,11 +1294,9 @@ Ox.VideoEditor = function(options, self) {
 
     function togglePaused() {
         self.$player[0].togglePaused();
-        ///* FIXME
         self.$player[0].options('paused') && that.triggerEvent('position', {
             position: self.$player[0].options('position')
         });
-        //*/
     }
 
     function toggleSize() {