diff --git a/test/tests/itemPaneTest.js b/test/tests/itemPaneTest.js
index f9e6534bd6..73ec6e760e 100644
--- a/test/tests/itemPaneTest.js
+++ b/test/tests/itemPaneTest.js
@@ -257,23 +257,18 @@ describe("Item pane", function () {
 			var item = new Zotero.Item('note');
 			var id = yield item.saveTx();
 			
+			var noteEditor = doc.getElementById('zotero-note-editor');
+			
 			// Wait for the editor
-			var noteBox = doc.getElementById('zotero-note-editor');
-			var val = false;
-			do {
-				try {
-					val = noteBox.noteField.value;
-				}
-				catch (e) {}
-				yield Zotero.Promise.delay(1);
-			}
-			while (val === false)
-			assert.equal(noteBox.noteField.value, '');
+			yield new Zotero.Promise((resolve, reject) => {
+				noteEditor.noteField.onInit(() => resolve());
+			})
+			assert.equal(noteEditor.noteField.value, '');
 			
 			item.setNote('<p>Test</p>');
 			yield item.saveTx();
 			
-			assert.equal(noteBox.noteField.value, '<p>Test</p>');
+			assert.equal(noteEditor.noteField.value, '<p>Test</p>');
 		})
 	})