diff --git a/modules/svg/notes.js b/modules/svg/notes.js
index d34a0dcdd..a42b9cde7 100644
--- a/modules/svg/notes.js
+++ b/modules/svg/notes.js
@@ -71,7 +71,7 @@ export function svgNotes(projection, context, dispatch) {
         var data = (service ? service.notes(projection) : []);
         var transform = svgPointTransform(projection);
         var notes = layer.selectAll('.note')
-            .data(data, function(d) { return d.id; });
+            .data(data, function(d) { return d.status + d.id; });
 
         // exit
         notes.exit()
diff --git a/modules/ui/note_editor.js b/modules/ui/note_editor.js
index cde11ced9..0629fef71 100644
--- a/modules/ui/note_editor.js
+++ b/modules/ui/note_editor.js
@@ -62,7 +62,7 @@ export function uiNoteEditor(context) {
     function noteSave(selection) {
         var isSelected = (_note && _note.id === context.selectedNoteID());
         var noteSave = selection.selectAll('.note-save-section')
-            .data((isSelected ? [_note] : []), function(d) { return d.id; });
+            .data((isSelected ? [_note] : []), function(d) { return d.status + d.id; });
 
         // exit
         noteSave.exit()
@@ -115,7 +115,7 @@ export function uiNoteEditor(context) {
     function noteSaveButtons(selection) {
         var isSelected = (_note && _note.id === context.selectedNoteID());
         var buttonSection = selection.selectAll('.buttons')
-            .data((isSelected ? [_note] : []), function(d) { return d.id; });
+            .data((isSelected ? [_note] : []), function(d) { return d.status + d.id; });
 
         // exit
         buttonSection.exit()
diff --git a/modules/ui/note_header.js b/modules/ui/note_header.js
index 126966388..0b5164164 100644
--- a/modules/ui/note_header.js
+++ b/modules/ui/note_header.js
@@ -8,7 +8,7 @@ export function uiNoteHeader() {
 
     function noteHeader(selection) {
         var header = selection.selectAll('.note-header')
-            .data([_note], function(d) { return d.id; });
+            .data([_note], function(d) { return d.status + d.id; });
 
         header.exit()
             .remove();