diff --git a/app/components/SimpleEditor/miniEditor/miniEditor.js b/app/components/SimpleEditor/miniEditor/miniEditor.js
index 5a1e97253c20197d1b9732b58774a19241a8b912..b4e91a6a69f9f4d0a01b7a65dc4e8bc28174a58d 100644
--- a/app/components/SimpleEditor/miniEditor/miniEditor.js
+++ b/app/components/SimpleEditor/miniEditor/miniEditor.js
@@ -11,15 +11,10 @@ class MiniEditor extends ProseEditor {
 
   didMount () {
     this.context.notesProvider.config.miniEditorContext = this.getChildContext()
-    this.editorSession.onUpdate('document', this.reComputeEntries, this)
     this.context.notesProvider.config.miniEditorSession = this.editorSession
     this.on('noteSelected', this.scrollTo, this)
   }
 
-  reComputeEntries () {
-    this.context.notesProvider.computeEntries()
-  }
-
   render ($$) {
     const el = $$('div').addClass('sc-mini-editor')
     let toolbar = this._renderMiniToolbar($$)
diff --git a/app/components/SimpleEditor/panes/Comments/CommentBoxList.js b/app/components/SimpleEditor/panes/Comments/CommentBoxList.js
index 1cc71991f39ab98eba80794b00afbcaa428dbdac..90f1ca8b7a4db6a04eb968d9c4a7f7dd38101671 100644
--- a/app/components/SimpleEditor/panes/Comments/CommentBoxList.js
+++ b/app/components/SimpleEditor/panes/Comments/CommentBoxList.js
@@ -74,7 +74,7 @@ class CommentBoxList extends Component {
     const entries = provider.computeEntries()
 
     const activeEntry = provider.activeEntry
-    console.log(entries)
+
     this.calculateTops(entries, activeEntry)
   }
   // TODO move to helper section??
diff --git a/app/components/SimpleEditor/panes/Notes/Notes.js b/app/components/SimpleEditor/panes/Notes/Notes.js
index 40fc2c639e0e3611e98bc3a5238c48270a364fdd..e1a95046158bed4d5f74642d5a52a82580fa3264 100644
--- a/app/components/SimpleEditor/panes/Notes/Notes.js
+++ b/app/components/SimpleEditor/panes/Notes/Notes.js
@@ -93,6 +93,9 @@ class Notes extends Component {
 
   saveNotes (source) {
     const provider = this.getProvider()
+    // For some reason the first character is not in the annotation so it is not getting saved
+    // so we rerender the Surface
+    provider.config.miniEditorContext.surfaceManager.getSurface('mini').rerender()
     const notes = provider.computeEntries()
     let self = this
 
@@ -136,6 +139,7 @@ class Notes extends Component {
 
   onNotesUpdated (change) {
     const notesProvider = this.getProvider()
+    notesProvider.config.miniEditorContext.surfaceManager.getSurface('mini').rerender()
     notesProvider.handleDocumentChange(change)
     // this.el.el.style.height = '95px'
   }
diff --git a/app/components/SimpleEditor/panes/Notes/NotesProvider.js b/app/components/SimpleEditor/panes/Notes/NotesProvider.js
index 7bd47648a2a17135e15ad7d9705bfea9082953b2..5978a798a4485f24bebfd6421ed6b891367e7d95 100644
--- a/app/components/SimpleEditor/panes/Notes/NotesProvider.js
+++ b/app/components/SimpleEditor/panes/Notes/NotesProvider.js
@@ -63,24 +63,19 @@ class NotesProvider extends TOCProvider {
 
     let notes = _.clone(nodes)
     let rootEl = this.config.miniEditorContext.editor.el
-    let i = 0
+
     notes = _.map(notes, function (note) {
       const element = Component.unwrap(rootEl.find('p[data-path="' + note.id + '.content"]'))
       // removes a <br> insterted at the end by inline node
       const text = element.innerHTML.slice(0, -4)
       let noteContent = '<isolated-note data-id="' + note.id + '" parent-id="' + note.parentNoteId + '" data-type="isolated-note">' + text + '</isolated-note>'
 
-      // TODO For some reason the first character is not in the annotation so it is not getting saved. For that
-      // miniEditor has a reComputeEntries and in here we rerender Surface only the first time to get the character.
-      if (i === 0) this.config.miniEditorContext.surfaceManager.getSurface('mini').rerender()
-      i++
-
       return {
         id: note.id,
         content: noteContent,
         parentNoteId: note.parentNoteId
       }
-    }.bind(this))
+    })
 
     return notes
   }