diff --git a/chrome/content/zotero/xpcom/collectionTreeView.js b/chrome/content/zotero/xpcom/collectionTreeView.js
index eeb42e6d00..c9bd989876 100644
--- a/chrome/content/zotero/xpcom/collectionTreeView.js
+++ b/chrome/content/zotero/xpcom/collectionTreeView.js
@@ -575,6 +575,28 @@ Zotero.CollectionTreeView.prototype.isSelectable = function (row, col) {
 }
 
 
+/**
+ * Tree method for whether to allow inline editing (not to be confused with this.editable)
+ */
+Zotero.CollectionTreeView.prototype.isEditable = function (row, col) {
+	return this.itemGroup.isCollection() && this.editable;
+}
+
+
+Zotero.CollectionTreeView.prototype.setCellText = function (row, col, val) {
+	val = val.trim();
+	if (val === "") {
+		return;
+	}
+	this.itemGroup.ref.name = val;
+	this.itemGroup.ref.save();
+}
+
+
+
+/**
+ * Returns TRUE if the underlying view is editable
+ */
 Zotero.CollectionTreeView.prototype.__defineGetter__('editable', function () {
 	return this._getItemAtRow(this.selection.currentIndex).editable;
 });
@@ -1803,7 +1825,6 @@ Zotero.CollectionTreeView.prototype.drop = function(row, orient, dataTransfer)
 ////////////////////////////////////////////////////////////////////////////////
 
 Zotero.CollectionTreeView.prototype.isSorted = function() 							{ return false; }
-Zotero.CollectionTreeView.prototype.isEditable = function(row, idx) 				{ return false; }
 
 /* Set 'highlighted' property on rows set by setHighlightedRows */
 Zotero.CollectionTreeView.prototype.getRowProperties = function(row, prop) {
diff --git a/chrome/content/zotero/zoteroPane.xul b/chrome/content/zotero/zoteroPane.xul
index 301873cc11..7bb90bea8d 100644
--- a/chrome/content/zotero/zoteroPane.xul
+++ b/chrome/content/zotero/zoteroPane.xul
@@ -301,7 +301,7 @@
 					<tree id="zotero-collections-tree" hidecolumnpicker="true" context="zotero-collectionmenu"
 						onmouseover="ZoteroPane_Local.collectionsView.setHighlightedRows();"
 						onselect="ZoteroPane_Local.onCollectionSelected();"
-						seltype="cell" flex="1">
+						seltype="cell" flex="1" editable="true">
 						<treecols>
 							<treecol
 								id="zotero-collections-name-column"