From db428ad90f73bd810b35e5de2c0ff2c044a5c5c0 Mon Sep 17 00:00:00 2001
From: Tom Najdek <tom@doppnet.com>
Date: Mon, 14 Jun 2021 23:33:55 +0200
Subject: [PATCH] Blur active field in switchCreatorMode #2087 (#2088)

---
 chrome/content/zotero/bindings/itembox.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/chrome/content/zotero/bindings/itembox.xml b/chrome/content/zotero/bindings/itembox.xml
index b1f961e3ca..4b15d3e05c 100644
--- a/chrome/content/zotero/bindings/itembox.xml
+++ b/chrome/content/zotero/bindings/itembox.xml
@@ -1068,7 +1068,12 @@
 						fields.fieldMode = fieldMode;
 						this.modifyCreator(index, fields);
 						if (this.saveOnEdit) {
-							this.item.saveTx();
+							let activeField = this._dynamicFields.querySelector('textbox');
+							if (activeField !== null && activeField !== firstName && activeField !== lastName) {
+								this.blurOpenField();
+							} else {
+								this.item.saveTx();
+							}
 						}
 					}
 				]]>