diff --git a/mailnews/base/search/resources/content/searchWidgets.xml b/mailnews/base/search/resources/content/searchWidgets.xml
index 9926ab66a848..891d86da159e 100644
--- a/mailnews/base/search/resources/content/searchWidgets.xml
+++ b/mailnews/base/search/resources/content/searchWidgets.xml
@@ -168,7 +168,13 @@
             {
               var filterActionRow = listBox.getItemAtIndex(index);
               if (filterActionRow != currentFilterActionRow)
-                usedActions[filterActionRow.getAttribute('value')] = true;
+              {
+                var actionValue = filterActionRow.getAttribute('value');
+
+                // don't add the tag action, several tags can be set
+                if (actionValue != 'addtagtomessage')
+                  usedActions[actionValue] = true;
+              }
             }
             return usedActions;
           ]]>