diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
index 7310b18e18..639d7f0c8e 100644
--- a/chrome/content/zotero/zoteroPane.js
+++ b/chrome/content/zotero/zoteroPane.js
@@ -3020,9 +3020,14 @@ var ZoteroPane = new function()
 	
 	this.onItemTreeActivate = function(event, items) {
 		var viewOnDoubleClick = Zotero.Prefs.get('viewOnDoubleClick');
-		if (items.length == 1 && (!event.button || viewOnDoubleClick)) {
+		// Mouse event
+		if (event.button && items.length == 1 && viewOnDoubleClick) {
 			ZoteroPane.viewItems([items[0]], event);
 		}
+		// Keyboard event
+		else if (items.length < 20) {
+			ZoteroPane_Local.viewItems(items, event);
+		}
 	};
 	
 	this.openPreferences = function (paneID, action) {