diff --git a/webviews/src/views/RokuDeviceView/RokuDeviceView.svelte b/webviews/src/views/RokuDeviceView/RokuDeviceView.svelte
index 55e6ae3a..23cdac9e 100644
--- a/webviews/src/views/RokuDeviceView/RokuDeviceView.svelte
+++ b/webviews/src/views/RokuDeviceView/RokuDeviceView.svelte
@@ -224,7 +224,7 @@
             enableScreenshotCapture = false;
 
             if (isInspectingNodes) {
-                lastStoreNodesResponse = odc.storeNodeReferences({
+                lastStoreNodesResponse = await odc.storeNodeReferences({
                     includeNodeCountInfo: true,
                     includeArrayGridChildren: true,
                     includeBoundingRectInfo: true
@@ -388,6 +388,7 @@
                 <b>height:</b> {focusedTreeNode.sceneRect.height}
             </div>
         {/if}
+        <!-- only show image if we have a url to avoid showing as broken image -->
         {#if screenshotUrl}
             <img
                 id="screenshot"
diff --git a/webviews/src/views/SceneGraphInspectorView/Branch.svelte b/webviews/src/views/SceneGraphInspectorView/Branch.svelte
index b0833f59..6bbf8f71 100644
--- a/webviews/src/views/SceneGraphInspectorView/Branch.svelte
+++ b/webviews/src/views/SceneGraphInspectorView/Branch.svelte
@@ -25,10 +25,35 @@
 
     export let expandTreeNode: TreeNodeWithBase | undefined;
     $: {
-        // Don't want to run on empty keypaths as these are at the base level and should stay expanded
-        if (treeNode.keyPath) {
-            // Want to collapse for everything but Scene which has an empty key path
+        // We we want the only variable in the reactive statement to be expandTreeNode or else it will also trigger when expanded changes as well
+        expandTreeNodeChecks(expandTreeNode);
+    }
+
+    function expandTreeNodeChecks(expandTreeNode) {
+        if (!expandTreeNode) {
+            // Don't want to run on empty keypaths as these are at the base level and should stay expanded
+            if (treeNode.keyPath) {
+                expanded = false
+            }
+        } else {
             expanded = doTreeNodesMatch(treeNode, expandTreeNode);
+
+            if (expanded) {
+                // We need to expand all the parents before we can calculate how far we need to scroll down
+                dispatch('childExpanded');
+
+                const scrollToElement = (element) => {
+                    const offset = getOffset(element);
+                    document.getElementById('container').scrollTo({
+                        left: 0,
+                        top: offset.top - 90,
+                        behavior: 'auto'
+                    });
+                }
+                setTimeout(() => {
+                    scrollToElement(self);
+                }, 0);
+            }
         }
     }
 
@@ -43,9 +68,7 @@
 
     function doTreeNodesMatch(treeNodeA: TreeNodeWithBase, treeNodeB: TreeNodeWithBase | undefined) {
         if (treeNodeB) {
-            if (treeNodeA.subtype === 'MainNode') {
-            }
-            if (treeNodeA.parentRef >= 0 && treeNodeB.parentRef >= 0) {
+            if (treeNodeA.parentRef >= 0 && (treeNodeB.parentRef >= 0 || treeNodeB.parentRef === undefined)) {
                 // Use key path to compare if we have a parentRef
                 if (treeNodeA.keyPath === treeNodeB.keyPath && treeNodeB.base === treeNodeB.base) {
                     return true;
diff --git a/webviews/src/views/SceneGraphInspectorView/SceneGraphInspectorView.svelte b/webviews/src/views/SceneGraphInspectorView/SceneGraphInspectorView.svelte
index 6dca9985..ea806c8d 100644
--- a/webviews/src/views/SceneGraphInspectorView/SceneGraphInspectorView.svelte
+++ b/webviews/src/views/SceneGraphInspectorView/SceneGraphInspectorView.svelte
@@ -141,7 +141,6 @@
     }
 
     intermediary.observeEvent(ViewProviderEvent.onTreeNodeFocused, (message) => {
-        console.log('received onTreeNodeFocused', message.context.treeNode);
         const context = message.context;
         selectTreeNode = context.treeNode;
         expandTreeNode = context.treeNode;