diff --git a/app/components/SimpleEditor/ContainerEditor.js b/app/components/SimpleEditor/ContainerEditor.js
index db78b1facfb12012bbc3c8ca34fea453adb32dba..938ba96df60e88a8ce713464093b925c1c665fcc 100644
--- a/app/components/SimpleEditor/ContainerEditor.js
+++ b/app/components/SimpleEditor/ContainerEditor.js
@@ -34,8 +34,8 @@ class ContainerEditor extends SubstanceContainerEditor {
 
   didMount () {
     super.didMount()
-
-    if (this.isEmpty()) this.createText()
+    const containerId = this.getContainerId()
+    if (this.isEmpty() && containerId !== 'mini') this.createText()
 
     // TODO -- why this and not this.focus ?
     this.el.focus()
diff --git a/app/components/SimpleEditor/panes/Notes/NotesProvider.js b/app/components/SimpleEditor/panes/Notes/NotesProvider.js
index 5978a798a4485f24bebfd6421ed6b891367e7d95..3e35b677a91283ba2bcbdeedf87e33a70a2c620c 100644
--- a/app/components/SimpleEditor/panes/Notes/NotesProvider.js
+++ b/app/components/SimpleEditor/panes/Notes/NotesProvider.js
@@ -30,6 +30,9 @@ class NotesProvider extends TOCProvider {
       mini: entriesMini
     }
 
+    if (entriesMini && entriesMain.length < entriesMini.length) {
+      this.findDeletedNote(entries)
+    }
     return entries
   }
 
@@ -97,9 +100,9 @@ class NotesProvider extends TOCProvider {
   createIsolatedNote (note) {
     const notes = this.computeEntries()
 
+    const containerId = this.getMiniContainerId()
+    let surface = this.config.miniEditorContext.surfaceManager.getSurface(containerId)
     if (notes.mini && notes.mini.length > 0) {
-      const containerId = this.getMiniContainerId()
-      let surface = this.config.miniEditorContext.surfaceManager.getSurface(containerId)
       let container = surface.getContainer()
 
       let findIndex = _.findIndex(notes.main, ['id', note.id])
@@ -112,6 +115,7 @@ class NotesProvider extends TOCProvider {
         }
       })
     } else {
+      surface.createText()
       this.config.miniEditorSession.transaction(function (tx) {
         let nodeData = this.createNodeData(note)
         tx.insertBlockNode(nodeData)
@@ -119,6 +123,36 @@ class NotesProvider extends TOCProvider {
     }
   }
 
+  findDeletedNote (entries) {
+    let position
+    let note
+    if (entries.main.length === 0) {
+      position = 0
+      note = entries.mini[0]
+    } else {
+      _.forEach(entries.main, function (mainNote) {
+        _.forEach(entries.mini, function (miniNote) {
+          if (miniNote.parentNoteId !== mainNote.id) {
+            position = _.findIndex(entries.mini, ['id', miniNote.id])
+            note = miniNote
+          }
+        })
+      })
+    }
+
+    return this.removeIsolatedNote(position, note)
+  }
+
+  removeIsolatedNote (position, note) {
+    const containerId = this.getMiniContainerId()
+    let surface = this.config.miniEditorContext.surfaceManager.getSurface(containerId)
+    let container = surface.getContainer()
+    this.config.miniEditorSession.transaction(function (tx) {
+      tx.update(container.getContentPath(), { type: 'delete', pos: position })
+      tx.delete(note.id)
+    })
+  }
+
   getMiniContainerId () {
     return this.config.miniEditorContext.editor.props.containerId
   }