diff --git a/packages/trace-viewer/src/ui/uiModeTestListView.tsx b/packages/trace-viewer/src/ui/uiModeTestListView.tsx
index 962bb01bfb..de51fba1c4 100644
--- a/packages/trace-viewer/src/ui/uiModeTestListView.tsx
+++ b/packages/trace-viewer/src/ui/uiModeTestListView.tsx
@@ -137,14 +137,15 @@ export const TestListView: React.FC<{
   const handleTagClick = (e: React.MouseEvent, tag: string) => {
     e.preventDefault();
     e.stopPropagation();
-    if (e.metaKey) {
+    if (e.metaKey || e.ctrlKey) {
       const parts = filterText.split(' ');
       if (parts.includes(tag))
         setFilterText(parts.filter(t => t !== tag).join(' '));
       else
         setFilterText((filterText + ' ' + tag).trim());
     } else {
-      setFilterText(tag);
+      // Replace all existing tags with this tag.
+      setFilterText(filterText.split(' ').filter(t => !t.startsWith('@')).join(' ') + ' ' + tag);
     }
   };