diff --git a/chrome/content/zotero/bindings/tagselector.xml b/chrome/content/zotero/bindings/tagselector.xml
index 413fa516e1..2ca9ffc6bc 100644
--- a/chrome/content/zotero/bindings/tagselector.xml
+++ b/chrome/content/zotero/bindings/tagselector.xml
@@ -369,12 +369,13 @@
 								delete self.selection[name];
 								var doCommand = true;
 							}
-
 							
-							// Always show colored tags at top
-							if (colorData) {
+							// Always show colored tags at top, unless they
+							// don't match an active tag search
+							if (colorData && (!self._search || inSearch)) {
 								labels[i].setAttribute('hidden', false);
 								labels[i].setAttribute('hasColor', true);
+								empty = false;
 							}
 							else {
 								labels[i].removeAttribute('hasColor');