diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
index 2094bb0309..cf73a3c671 100644
--- a/chrome/content/zotero/zoteroPane.js
+++ b/chrome/content/zotero/zoteroPane.js
@@ -759,7 +759,7 @@ var ZoteroPane = new function()
 		try {
 			switch (command) {
 				case 'library':
-					this.collectionsView.focus();
+					document.getElementById(ZoteroPane.collectionsView.id).focus();
 					break;
 				case 'quicksearch':
 					document.getElementById('zotero-tb-search').select();
@@ -2228,7 +2228,7 @@ var ZoteroPane = new function()
 		
 		// Focus the items pane
 		if (found) {
-			document.getElementById('zotero-items-tree').focus();
+			document.getElementById(ZoteroPane.itemsView.id).focus();
 		}
 		
 		Zotero_Tabs.select('zotero-pane');