diff --git a/src/TreeView/TreeView.svelte b/src/TreeView/TreeView.svelte
index b58f1d13..09409b05 100644
--- a/src/TreeView/TreeView.svelte
+++ b/src/TreeView/TreeView.svelte
@@ -81,7 +81,7 @@
   }
 
   onMount(() => {
-    if ($activeNodeId === "") {
+    if ($activeNodeId !== $selectedNodeIds[0]) {
       const firstFocusableNode = ref.querySelector(
         "li.bx--tree-node:not(.bx--tree-node--disabled)"
       );