diff --git a/chrome/content/zotero/bindings/noteeditor.xml b/chrome/content/zotero/bindings/noteeditor.xml
index 049fe119e..e40906b50 100644
--- a/chrome/content/zotero/bindings/noteeditor.xml
+++ b/chrome/content/zotero/bindings/noteeditor.xml
@@ -171,6 +171,10 @@
 							//Zotero.debug("Skipping notification from current note field");
 							continue;
 						}
+						if (this.noteField.changed) {
+							//Zotero.debug("Note has changed since last save -- skipping refresh");
+							return;
+						}
 						this.refresh();
 						break;
 					}
@@ -181,7 +185,7 @@
 				<body><![CDATA[
 					Zotero.debug('Refreshing note editor');
 					
-					var textbox = this._id('noteField');
+					var textbox = this.noteField;
 					var textboxReadOnly = this._id('noteFieldReadOnly');
 					var button = this._id('goButton');
 					
@@ -249,6 +253,7 @@
 							if (this.item) {
 								let changed = this.item.setNote(noteField.value);
 								if (changed && this.saveOnEdit) {
+									this.noteField.changed = false;
 									yield this.item.saveTx({
 										notifierData: {
 											noteEditorID: this._instanceID
diff --git a/chrome/content/zotero/bindings/styled-textbox.xml b/chrome/content/zotero/bindings/styled-textbox.xml
index 1ac380517..45733f86f 100644
--- a/chrome/content/zotero/bindings/styled-textbox.xml
+++ b/chrome/content/zotero/bindings/styled-textbox.xml
@@ -429,6 +429,7 @@
 											//Zotero.debug("Not a char");
 											return;
 										}
+										this._changed = true;
 										commandEvent = true;
 										break;
 									
@@ -436,6 +437,7 @@
 									case 'change':
 									case 'undo':
 									case 'redo':
+										this._changed = true;
 										commandEvent = true;
 										break;
 
@@ -524,6 +526,7 @@
 					
 					if (this.value == val) {
 						Zotero.debug("Textbox value hasn't changed");
+						this._changed = false;
 						return;
 					}
 					
@@ -570,7 +573,7 @@
 					onset="this.setAttribute('timeout', val); return val;"
 					onget="return parseInt(this.getAttribute('timeout')) || 0;"/>
 			
-			<property name="changed" onget="return this._changed;"/>
+			<property name="changed" onget="return this._changed;" onset="this._changed = !!val;"/>
 			
 			<method name="focus">
 				<body>
