diff --git a/chrome/content/zotero/bindings/tagselector.xml b/chrome/content/zotero/bindings/tagselector.xml
index 36f43ff127..b4439fcca8 100644
--- a/chrome/content/zotero/bindings/tagselector.xml
+++ b/chrome/content/zotero/bindings/tagselector.xml
@@ -268,7 +268,7 @@
 						// Otherwise just update based on visibility
 						else {
 							// If only a few tags, regenerate buttons from scratch
-							if (this.filterToScope && Object.keys(this.scope).length <= 100) {
+							if (false && this.filterToScope && Object.keys(this.scope).length <= 100) {
 								// If full set is currently displayed, store it for later
 								if (!this._tagsDiv) {
 									this._tagsDiv = tagsBox.firstChild;
diff --git a/test/tests/tagSelectorTest.js b/test/tests/tagSelectorTest.js
index 436474bb12..3d3f4e8fc2 100644
--- a/test/tests/tagSelectorTest.js
+++ b/test/tests/tagSelectorTest.js
@@ -48,7 +48,10 @@ describe("Tag Selector", function () {
 	beforeEach(function* () {
 		var libraryID = Zotero.Libraries.userLibraryID;
 		yield clearTagColors(libraryID);
-		yield doc.getElementById('zotero-tag-selector').refresh(true);
+		var tagSelector = doc.getElementById('zotero-tag-selector');
+		// Default "Display All Tags in This Library" off
+		tagSelector.filterToScope = true;
+		yield tagSelector.refresh(true);
 	})
 	after(function () {
 		win.close();