diff --git a/packages/trace-viewer/src/ui/workbench.tsx b/packages/trace-viewer/src/ui/workbench.tsx
index c2e9075480..01ae6142bd 100644
--- a/packages/trace-viewer/src/ui/workbench.tsx
+++ b/packages/trace-viewer/src/ui/workbench.tsx
@@ -113,8 +113,9 @@ export const Workbench: React.FunctionComponent<{
 
   const onActionSelected = React.useCallback((action: modelUtil.ActionTraceEventInContext) => {
     setSelectedAction(action);
+    setHighlightedAction(undefined);
     onSelectionChanged?.(action);
-  }, [setSelectedAction, onSelectionChanged]);
+  }, [setSelectedAction, onSelectionChanged, setHighlightedAction]);
 
   const selectPropertiesTab = React.useCallback((tab: string) => {
     setSelectedPropertiesTab(tab);
diff --git a/packages/web/src/components/listView.tsx b/packages/web/src/components/listView.tsx
index df8a2deca0..a932bf7435 100644
--- a/packages/web/src/components/listView.tsx
+++ b/packages/web/src/components/listView.tsx
@@ -128,6 +128,7 @@ export function ListView<T>({
         scrollIntoViewIfNeeded(element || undefined);
         onHighlighted?.(undefined);
         onSelected?.(items[newIndex], newIndex);
+        setHighlightedItem(undefined);
       }}
       ref={itemListRef}
     >