diff --git a/chrome/content/zotero/elements/contextPane.js b/chrome/content/zotero/elements/contextPane.js
index 235f6a498d..75df9412d3 100644
--- a/chrome/content/zotero/elements/contextPane.js
+++ b/chrome/content/zotero/elements/contextPane.js
@@ -317,8 +317,9 @@
 	
 			if (splitter.getAttribute('state') != 'collapsed') {
 				if (this.mode == "item") {
-					let header = this._itemPaneDeck.selectedPanel.querySelector("item-pane-header editable-text");
-					header.focus();
+					let header = this._itemPaneDeck.selectedPanel.querySelector("item-pane-header");
+					// Focus the first focusable node after header
+					Services.focus.moveFocus(window, header, Services.focus.MOVEFOCUS_FORWARD, 0);
 					return true;
 				}
 				else {