diff --git a/chrome/content/zotero/contextPane.js b/chrome/content/zotero/contextPane.js
index 570b764996..48dd5957e2 100644
--- a/chrome/content/zotero/contextPane.js
+++ b/chrome/content/zotero/contextPane.js
@@ -221,7 +221,7 @@ var ZoteroContextPane = new function () {
 							// Focus reader pages view if context pane note editor is not selected
 							if (Zotero_Tabs.selectedID == reader.tabID
 								&& (!document.activeElement
-									|| !document.activeElement.closest('.context-node iframe[anonid="editor-view"]'))) {
+									|| !document.activeElement.closest('.context-node iframe[id="editor-view"]'))) {
 								reader.focus();
 							}
 							
diff --git a/chrome/content/zotero/xpcom/reader.js b/chrome/content/zotero/xpcom/reader.js
index 4814912e47..6f1afcba01 100644
--- a/chrome/content/zotero/xpcom/reader.js
+++ b/chrome/content/zotero/xpcom/reader.js
@@ -81,14 +81,6 @@ class ReaderInstance {
 		return this._type;
 	}
 
-	focus() {
-		try {
-			this._iframeWindow.document.querySelector('#viewerContainer').focus();
-		}
-		catch (e) {
-		}
-	}
-
 	getSecondViewState() {
 		let state = this._iframeWindow.wrappedJSObject.getSecondViewState();
 		return state ? JSON.parse(JSON.stringify(state)) : undefined;
diff --git a/pdf-reader b/pdf-reader
index 0b1731ff35..2f22ad18e3 160000
--- a/pdf-reader
+++ b/pdf-reader
@@ -1 +1 @@
-Subproject commit 0b1731ff35078cbea1dd67458d72dc5890d9b385
+Subproject commit 2f22ad18e355aa1aa4b396d514f71e494e84d613