           @_inactivateHighlights()
         when athena.lib.util.keys.ESCAPE
           @_inactivateHighlights()
-    'click .note.btn.btn-success': =>
+    'click .note-save.btn': =>
       @_saveHighlightNote()
+      @_inactivateHighlights()
+    'click .note-delete.btn': =>
+      @_deleteHighlight()
       @_inactivateHighlights()
 
 

          highlightView.toggleActive false

      # adjust clip note inputs
      @$('.note-input button').first().removeAttr('disabled')
      @$('.note-input input').first().removeAttr('disabled')
        .val(highlight.title).focus()

    clipView.on 'ClipSelect:Inactive', =>
      # adjust clip note inputs
      @$('.note-input button').first().attr('disabled', 'disabled')
      @$('.note-input input').first().attr('disabled', 'disabled').val('')

    clipView

    @_activeHighlight()?.clip.title = @$('.note-input input').first().val()


  _deleteHighlight: =>
    highlightView = @_activeHighlight()
    unless highlightView
      return

    @_inactivateHighlights()

    # remove from model
    highlights = @model.highlights()
    highlights.splice(highlights.indexOf(highlightView.clip), 1)

    # remove from views
    @highlightViews.splice(@highlightViews.indexOf(highlightView), 1)

    @clipGroupView.softRender()

  _inactivateHighlights: =>
    _.each @highlightViews, (highlightView) =>
      highlightView.toggleActive false
