diff --git a/chrome/content/zotero/xpcom/collectionTreeView.js b/chrome/content/zotero/xpcom/collectionTreeView.js
index 887a76979..1c38d4316 100644
--- a/chrome/content/zotero/xpcom/collectionTreeView.js
+++ b/chrome/content/zotero/xpcom/collectionTreeView.js
@@ -41,6 +41,7 @@ Zotero.CollectionTreeView = function()
 	this.itemTreeView = null;
 	this.itemToSelect = null;
 	this.hideSources = [];
+	this._searchText = '';
 	
 	this._highlightedRows = {};
 	this._unregisterID = Zotero.Notifier.registerObserver(
@@ -1088,6 +1089,14 @@ Zotero.CollectionTreeView.prototype.selectByID = Zotero.Promise.coroutine(functi
 	return true;
 });
 
+Zotero.CollectionTreeView.prototype.setSearch = Zotero.Promise.coroutine(function* (val) {
+	this._searchText = val ? val : '';
+	if (this.isContainerOpen(0)) {
+		this._closeContainer(0);
+		this._rows[0].isOpen = false;
+	}
+	this.toggleOpenState(0);
+});
 
 /**
  * @param	{Integer}		libraryID		Library to select
@@ -1344,15 +1353,35 @@ Zotero.CollectionTreeView.prototype._expandRow = Zotero.Promise.coroutine(functi
 	
 	// Add collections
 	for (var i = 0, len = collections.length; i < len; i++) {
-		let beforeRow = row + 1 + newRows;
-		this._addRowToArray(
-			rows,
-			new Zotero.CollectionTreeRow(this, 'collection', collections[i], level + 1),
-			beforeRow
-		);
-		newRows++;
-		// Recursively expand child collections that should be open
-		newRows += yield this._expandRow(rows, beforeRow);
+flds = "";
+for (field in collections[i]) { flds += ",\n " + field + " = " + collections[i][field]; }
+//alert(flds);
+		var searchInChildCollections = function (collection, str) {
+//alert(collection.name);
+			if (collection.name.toLowerCase().indexOf(str) >= 0) {
+				return true;
+			}
+			else {
+				var rcollections = collection.getChildCollections();
+				for (var j = 0, jlen = rcollections.length; j < jlen; j++) {
+					if (searchInChildCollections(rcollections[j], str)) {
+						return true;
+					}
+				}
+				return false;
+			}
+		}
+		if (searchInChildCollections(collections[i], this._searchText)) {
+			let beforeRow = row + 1 + newRows;
+			this._addRowToArray(
+				rows,
+				new Zotero.CollectionTreeRow(this, 'collection', collections[i], level + 1),
+				beforeRow
+			);
+			newRows++;
+			// Recursively expand child collections that should be open
+			newRows += yield this._expandRow(rows, beforeRow);
+		}
 	}
 	
 	if (isCollection) {
diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
index 48d2c42c6..1cbd0f54d 100644
--- a/chrome/content/zotero/zoteroPane.js
+++ b/chrome/content/zotero/zoteroPane.js
@@ -958,6 +958,27 @@ var ZoteroPane = new function()
 		var toolbarButton = document.getElementById('zotero-tb-show-collection-lookup');
 		toolbarButton.checked = !collectionsLookupTextbox.hidden;
 	};
+	this._collectionSearch = false;
+	this.onCollectionLookup = function (clear) {
+		var setSearch = function(val) {
+			this._collectionSearch = val
+				? val.toLowerCase().normalize()
+				: false;
+			ZoteroPane_Local.collectionsView.setSearch(_collectionSearch);
+		};
+		var collectionsLookupTextbox = document.getElementById('zotero-collection-lookup-textbox');
+		if (typeof clear != 'undefined') {
+			if (clear){
+				collectionsLookupTextbox.value = '';
+				setSearch('');
+				return false;
+			}
+			else {
+				return true;
+			}
+		}
+		setSearch(collectionsLookupTextbox.value);
+	};	
 	
 	this.importFeedsFromOPML = Zotero.Promise.coroutine(function* (event) {
 		var nsIFilePicker = Components.interfaces.nsIFilePicker;
diff --git a/chrome/content/zotero/zoteroPane.xul b/chrome/content/zotero/zoteroPane.xul
index a090b9b1f..1a3a2457c 100644
--- a/chrome/content/zotero/zoteroPane.xul
+++ b/chrome/content/zotero/zoteroPane.xul
@@ -348,8 +348,8 @@
 							the tag selector to max height -->
 					<textbox id="zotero-collection-lookup-textbox" flex="0" type="search" timeout="250" dir="reverse"
 zotero-persist="hidden"
-						oncommand="document.getBindingParent(this).handleKeyPress(); event.stopPropagation()"
-						onkeypress="if (event.keyCode == event.DOM_VK_ESCAPE) { document.getBindingParent(this).handleKeyPress(true); }"/>
+						oncommand="ZoteroPane.onCollectionLookup(); event.stopPropagation()"
+						onkeypress="if (event.keyCode == event.DOM_VK_ESCAPE) { ZoteroPane.onCollectionLookup(true); }"/>
 					<tree id="zotero-collections-tree"
 							hidecolumnpicker="true"
 							oncontextmenu="ZoteroPane.onCollectionsContextMenuOpen(event)"