diff --git a/chrome/content/zotero/bindings/itembox.xml b/chrome/content/zotero/bindings/itembox.xml
index f463ccf6e8..62eeb6739d 100644
--- a/chrome/content/zotero/bindings/itembox.xml
+++ b/chrome/content/zotero/bindings/itembox.xml
@@ -552,7 +552,7 @@
 							this._displayAllCreators = true;
 							
 							if (this._addCreatorRow) {
-								this.addCreatorRow(false, false, true);
+								this.addCreatorRow(false, this.item.getCreator(max-1).creatorTypeID, true); 
 								this._addCreatorRow = false;
 								this.disableCreatorAddButtons();
 							}
@@ -1555,8 +1555,8 @@
 										this._focusNextField(this._dynamicFields, this._lastTabIndex, false);
 									}
 									else {
-										// TODO: should use current creator type
-										this.addCreatorRow(false, false, true);
+										var creatorFields = this.getCreatorFields(Zotero.getAncestorByTagName(target, 'row'));
+										this.addCreatorRow(false, creatorFields.creatorTypeID, true);
 									}
 								}
 								// Value has changed