diff --git a/chrome/content/zotero/bindings/tagselector.xml b/chrome/content/zotero/bindings/tagselector.xml
index 79393045b..326259e9a 100644
--- a/chrome/content/zotero/bindings/tagselector.xml
+++ b/chrome/content/zotero/bindings/tagselector.xml
@@ -547,10 +547,11 @@
 					<![CDATA[
 						var tagsToggleBox = this.id('tags-toggle');
 						
-						var labels = tagsToggleBox.getElementsByTagName('label');
+						var labels = Zotero.Utilities.xpath(tagsToggleBox, 'label[@selected="true"]');
 						for (var i=0; i<labels.length; i++){
-							labels[i].setAttribute('selected', 'false');
-							delete this.selection[labels[i].value];
+							var label = labels[i];
+							label.setAttribute('selected', 'false');
+							delete this.selection[label.value];
 						}
 						
 						this.doCommand();
diff --git a/chrome/content/zotero/xpcom/data/tags.js b/chrome/content/zotero/xpcom/data/tags.js
index 9d82a2061..3a8543b64 100644
--- a/chrome/content/zotero/xpcom/data/tags.js
+++ b/chrome/content/zotero/xpcom/data/tags.js
@@ -243,8 +243,8 @@ Zotero.Tags = new function() {
 		
 		var indexed = {};
 		for (var i=0; i<tags.length; i++) {
-			var tag = this.get(tags[i].tagID, true);
-			indexed[tags[i].tagID] = tag;
+			var tagID = tags[i].tagID;
+			indexed[tagID] = this.get(tagID, true);
 		}
 		return indexed;
 	}