diff --git a/chrome/content/zotero/bindings/noteeditor.xml b/chrome/content/zotero/bindings/noteeditor.xml
index 987c3d1b0f..049fe119e6 100644
--- a/chrome/content/zotero/bindings/noteeditor.xml
+++ b/chrome/content/zotero/bindings/noteeditor.xml
@@ -144,6 +144,7 @@
 			
 			<constructor>
 			<![CDATA[
+				this._instanceID = Zotero.Utilities.randomString();
 				this._notifierID = Zotero.Notifier.registerObserver(this, ['item'], 'noteeditor');
 			]]>
 			</constructor>
@@ -158,6 +159,7 @@
 				<parameter name="event"/>
 				<parameter name="type"/>
 				<parameter name="ids"/>
+				<parameter name="extraData"/>
 				<body><![CDATA[
 					if (event != 'modify' || !this.item || !this.item.id) return;
 					for (let i = 0; i < ids.length; i++) {
@@ -165,6 +167,10 @@
 						if (id != this.item.id) {
 							continue;
 						}
+						if (extraData && extraData[id] && extraData[id].noteEditorID == this._instanceID) {
+							//Zotero.debug("Skipping notification from current note field");
+							continue;
+						}
 						this.refresh();
 						break;
 					}
@@ -243,7 +249,11 @@
 							if (this.item) {
 								let changed = this.item.setNote(noteField.value);
 								if (changed && this.saveOnEdit) {
-									yield this.item.saveTx();
+									yield this.item.saveTx({
+										notifierData: {
+											noteEditorID: this._instanceID
+										}
+									});
 								}
 								return;
 							}
