diff --git a/chrome/content/zotero/xpcom/data/tags.js b/chrome/content/zotero/xpcom/data/tags.js
index 6d773c549..e0f04edbe 100644
--- a/chrome/content/zotero/xpcom/data/tags.js
+++ b/chrome/content/zotero/xpcom/data/tags.js
@@ -28,7 +28,7 @@
  * Same structure as Zotero.Creators -- make changes in both places if possible
  */
 Zotero.Tags = new function() {
-	this.MAX_COLORED_TAGS = 6;
+	this.MAX_COLORED_TAGS = 9;
 	this.MAX_SYNC_LENGTH = 255;
 	
 	var _initialized = false;
diff --git a/chrome/content/zotero/xpcom/itemTreeView.js b/chrome/content/zotero/xpcom/itemTreeView.js
index 3fd682855..4cebfcf1d 100644
--- a/chrome/content/zotero/xpcom/itemTreeView.js
+++ b/chrome/content/zotero/xpcom/itemTreeView.js
@@ -184,7 +184,7 @@ Zotero.ItemTreeView.prototype.setTree = Zotero.Promise.coroutine(function* (tree
 				}
 				
 				// We have to disable key navigation on the tree in order to
-				// keep it from acting on the 1-6 keys used for colored tags.
+				// keep it from acting on the 1-9 keys used for colored tags.
 				// To allow navigation with other keys, we temporarily enable
 				// key navigation and recreate the keyboard event. Since
 				// that will trigger this listener again, we set a flag to