diff --git a/frontend/javascripts/viewer/view/right-border-tabs/trees_tab/skeleton_tab_view.tsx b/frontend/javascripts/viewer/view/right-border-tabs/trees_tab/skeleton_tab_view.tsx
index d13cd59ed92..1b7047f7224 100644
--- a/frontend/javascripts/viewer/view/right-border-tabs/trees_tab/skeleton_tab_view.tsx
+++ b/frontend/javascripts/viewer/view/right-border-tabs/trees_tab/skeleton_tab_view.tsx
@@ -793,6 +793,16 @@ class SkeletonTabView extends React.PureComponent<Props, State> {
     });
   };
 
+  componentDidUpdate(prevProps: Props) {
+    if (this.props.skeletonTracing?.activeTreeId !== prevProps.skeletonTracing?.activeTreeId) {
+      if (this.props.skeletonTracing?.activeTreeId != null) {
+        this.setState({
+          selectedTreeIds: [this.props.skeletonTracing.activeTreeId],
+        });
+      }
+    }
+  }
+
   render() {
     const { skeletonTracing } = this.props;