     $('.viewer .display-wrapper .highlights-layer .highlights-layer-highlight').trigger 'annotationMouseleave', [@data._id]
     return # Make sure CoffeeScript does not return anything
 
-  ###
   if focusAnnotationId is @data._id
     focusAnnotationId = null
 
-    focusAnnotation $(@findAll '.annotation-content-editor').get(0)
-  ###
+    focusAnnotation $(@findAll '.body[contenteditable=true]').get(0)
 
 Template.publicationAnnotationsItem.canModify = ->
   @hasMaintainerAccess Meteor.person()


        LocalAnnotation.documents.remove @_id

        #focusAnnotationId = annotationId

        Meteor.Router.toNew Meteor.Router.annotationPath Session.get('currentPublicationId'), Session.get('currentPublicationSlug'), annotationId
    else

    Notify.debug "Destroying publication #{ @_id }"

    currentPublication = null
    focusAnnotationId = null

    pages = @_pages or []
    @_pages = null # To remove references to pdf.js elements to allow cleanup, and as soon as possible as this disables other callbacks
