diff --git a/src/ui/src/components/visualizer/sync_navigation_button.ts b/src/ui/src/components/visualizer/sync_navigation_button.ts
index 7ae99888..d74bde91 100644
--- a/src/ui/src/components/visualizer/sync_navigation_button.ts
+++ b/src/ui/src/components/visualizer/sync_navigation_button.ts
@@ -113,14 +113,13 @@ export class SyncNavigationButton {
           SyncNavigationMode.MATCH_NODE_ID,
           SyncNavigationMode.VISUALIZER_CONFIG,
           SyncNavigationMode.UPLOAD_MAPPING_FROM_COMPUTER,
-          SyncNavigationMode.LOAD_MAPPING_FROM_CNS,
         ]
       : [
           SyncNavigationMode.DISABLED,
           SyncNavigationMode.MATCH_NODE_ID,
           SyncNavigationMode.UPLOAD_MAPPING_FROM_COMPUTER,
-          SyncNavigationMode.LOAD_MAPPING_FROM_CNS,
         ];
+
     // If there is sync navigation data passed through visualizer config, set
     // the sync navigation data for the "visualizer config" mode and select the
     // mode by default.
diff --git a/src/ui/src/components/visualizer/webgl_renderer.ts b/src/ui/src/components/visualizer/webgl_renderer.ts
index d380e359..91e66c60 100644
--- a/src/ui/src/components/visualizer/webgl_renderer.ts
+++ b/src/ui/src/components/visualizer/webgl_renderer.ts
@@ -696,7 +696,12 @@ export class WebglRenderer implements OnInit, OnDestroy {
             data.nodeId,
           );
           const mappedNode = this.curModelGraph.nodesById[mappedNodeId];
-          if (mappedNode && mappedNode.id !== this.selectedNodeId) {
+          const hideInLayout = isOpNode(mappedNode) && mappedNode.hideInLayout;
+          if (
+            mappedNode &&
+            mappedNode.id !== this.selectedNodeId &&
+            !hideInLayout
+          ) {
             this.revealNode(mappedNodeId, false);
           }
         }