diff --git a/chrome/content/zotero/overlay.js b/chrome/content/zotero/overlay.js
index 99f34ce50..fb2df2758 100644
--- a/chrome/content/zotero/overlay.js
+++ b/chrome/content/zotero/overlay.js
@@ -354,7 +354,8 @@ var ZoteroPane = new function()
 	function _setTagScope() {
 		var itemgroup = collectionsView._getItemAtRow(collectionsView.selection.currentIndex);
 		var tagSelector = document.getElementById('zotero-tag-selector');
-		if (tagSelector.getAttribute('collapsed') == 'false') {
+		if (!tagSelector.getAttribute('collapsed') ||
+				tagSelector.getAttribute('collapsed') == 'false') {
 			Zotero.debug('Updating tag selector with current tags');
 			tagSelector.scope = itemgroup.getChildTags();
 		}