diff --git a/packages/react-devtools-shared/src/backend/views/Highlighter/index.js b/packages/react-devtools-shared/src/backend/views/Highlighter/index.js
index 2b651cdc9cc..155717e5d89 100644
--- a/packages/react-devtools-shared/src/backend/views/Highlighter/index.js
+++ b/packages/react-devtools-shared/src/backend/views/Highlighter/index.js
@@ -115,7 +115,7 @@ export default function setupHighlighter(
     const nodes = renderer.findHostInstancesForElementID(id);
     if (nodes != null) {
       for (let i = 0; i < nodes.length; i++) {
-        const node = nodes[0];
+        const node = nodes[i];
         if (node === null) {
           continue;
         }
@@ -164,7 +164,7 @@ export default function setupHighlighter(
     const nodes = renderer.findHostInstancesForElementID(id);
     if (nodes != null) {
       for (let i = 0; i < nodes.length; i++) {
-        const node = nodes[0];
+        const node = nodes[i];
         if (node === null) {
           continue;
         }
diff --git a/packages/react-devtools-shared/src/devtools/views/SuspenseTab/SuspenseBreadcrumbs.js b/packages/react-devtools-shared/src/devtools/views/SuspenseTab/SuspenseBreadcrumbs.js
index a9dcfc38f42..13dab6efbc7 100644
--- a/packages/react-devtools-shared/src/devtools/views/SuspenseTab/SuspenseBreadcrumbs.js
+++ b/packages/react-devtools-shared/src/devtools/views/SuspenseTab/SuspenseBreadcrumbs.js
@@ -66,7 +66,7 @@ export default function SuspenseBreadcrumbs(): React$Node {
               key={id}
               className={styles.SuspenseBreadcrumbsListItem}
               aria-current={selectedSuspenseID === id}
-              onPointerEnter={highlightHostInstance.bind(null, id)}
+              onPointerEnter={highlightHostInstance.bind(null, id, false)}
               onPointerLeave={clearHighlightHostInstance}>
               <button
                 className={styles.SuspenseBreadcrumbsButton}