diff --git a/chrome/content/zotero/bindings/noteeditor.xml b/chrome/content/zotero/bindings/noteeditor.xml
index 0f99d5dbcb..ffd21a99a1 100644
--- a/chrome/content/zotero/bindings/noteeditor.xml
+++ b/chrome/content/zotero/bindings/noteeditor.xml
@@ -233,12 +233,8 @@
 						if (this._destroyed) {
 							return;
 						}
-
-						if (!val) {
-							this._item = null;
-						}
 						
-						if (this._item && this._item.id === val.id) {
+						if (this._item && this._item.id && this._item.id === val.id) {
 							return;
 						}
 
diff --git a/note-editor b/note-editor
index ed8d0b84b3..0dc6d65a28 160000
--- a/note-editor
+++ b/note-editor
@@ -1 +1 @@
-Subproject commit ed8d0b84b3f16d66a75be11208ce5c8a3f3fc182
+Subproject commit 0dc6d65a28d1a2ec755e9f426fb98eb732109d92