diff --git a/components/zotero-autocomplete.js b/components/zotero-autocomplete.js
index da3a70a607..f376cbed65 100644
--- a/components/zotero-autocomplete.js
+++ b/components/zotero-autocomplete.js
@@ -211,6 +211,8 @@ ZoteroAutoComplete.prototype.startSearch = Zotero.Promise.coroutine(function* (s
 			sql += "ORDER BY value";
 	}
 	
+	sql += " LIMIT 25";
+	
 	var onRow = null;
 	// If there's a result callback (e.g., for sorting), don't use a row handler
 	if (!resultsCallback) {