diff --git a/chrome/content/zotero/bindings/itembox.xml b/chrome/content/zotero/bindings/itembox.xml
index 5b1130662..3c97c40e0 100644
--- a/chrome/content/zotero/bindings/itembox.xml
+++ b/chrome/content/zotero/bindings/itembox.xml
@@ -1446,12 +1446,13 @@
 									params.itemID = itemID;
 									params.creatorTypeID = creatorTypeID;
 								}
+								
+								t.setAttribute('ontextentered',
+									'document.getBindingParent(this).handleCreatorAutoCompleteSelect(this)');
 							};
 							t.setAttribute(
 								'autocompletesearchparam', JSON.stringify(params)
 							);
-							t.setAttribute('ontextentered',
-								'document.getBindingParent(this).handleCreatorAutoCompleteSelect(this)');
 						}
 					}
 					var box = elem.parentNode;
@@ -1489,6 +1490,7 @@
 				<![CDATA[
 					var comment = false;
 					var controller = textbox.controller;
+					if (!controller.matchCount) return;
 					
 					for (var i=0; i<controller.matchCount; i++)
 					{