diff --git a/website/o3dv/js/navigator.js b/website/o3dv/js/navigator.js
index 80a7e6d..4d16c9b 100644
--- a/website/o3dv/js/navigator.js
+++ b/website/o3dv/js/navigator.js
@@ -156,15 +156,15 @@ OV.Navigator = class
         function SetEntitySelection (navigator, selection, select)
         {
             if (selection.type === OV.SelectionType.Material) {
-                navigator.materialsPanel.GetMaterialItem (selection.materialIndex).SetSelected (select);
                 if (select) {
                     navigator.panelSet.ShowPanel (navigator.materialsPanel);
                 }
+                navigator.materialsPanel.GetMaterialItem (selection.materialIndex).SetSelected (select);
             } else if (selection.type === OV.SelectionType.Mesh) {
-                navigator.meshesPanel.GetMeshItem (selection.meshInstanceId).SetSelected (select);
                 if (select) {
                     navigator.panelSet.ShowPanel (navigator.meshesPanel);
                 }
+                navigator.meshesPanel.GetMeshItem (selection.meshInstanceId).SetSelected (select);
             }
         }
 
diff --git a/website/o3dv/js/navigatoritems.js b/website/o3dv/js/navigatoritems.js
index 69e8fac..ed5bc63 100644
--- a/website/o3dv/js/navigatoritems.js
+++ b/website/o3dv/js/navigatoritems.js
@@ -61,9 +61,9 @@ OV.MeshItem = class extends OV.TreeViewButtonItem
 
 OV.NodeItem = class extends OV.TreeViewGroupButtonItem
 {
-    constructor (name, icon, nodeId, callbacks)
+    constructor (name, nodeId, callbacks)
     {
-        super (name, icon);
+        super (name, null);
 
         this.fitToWindowButton = new OV.TreeViewButton ('fit');
         this.fitToWindowButton.OnClick (() => {
diff --git a/website/o3dv/js/navigatorpanels.js b/website/o3dv/js/navigatorpanels.js
index 044c5aa..9f837a3 100644
--- a/website/o3dv/js/navigatorpanels.js
+++ b/website/o3dv/js/navigatorpanels.js
@@ -330,11 +330,11 @@ OV.NavigatorMeshesPanel = class extends OV.NavigatorPanel
             parentItem.AddChild (meshItem);
         }
 
-        function CreateNodeItem (navigator, name, icon, node)
+        function CreateNodeItem (navigator, name, node)
         {
             const nodeName = OV.GetNodeName (name);
             const nodeId = node.GetId ();
-            let nodeItem = new OV.NodeItem (nodeName, icon, nodeId, {
+            let nodeItem = new OV.NodeItem (nodeName, nodeId, {
                 onShowHide : (selectedNodeId) => {
                     navigator.callbacks.onNodeShowHide (selectedNodeId);
                 },
@@ -352,7 +352,7 @@ OV.NavigatorMeshesPanel = class extends OV.NavigatorPanel
                 if (isFlat) {
                     AddModelNodeToTree (navigator, model, childNode, parentItem, isFlat);
                 } else {
-                    let nodeItem = CreateNodeItem (navigator, node.GetName (), null, childNode);
+                    let nodeItem = CreateNodeItem (navigator, node.GetName (), childNode);
                     parentItem.AddChild (nodeItem);
                     AddModelNodeToTree (navigator, model, childNode, nodeItem, isFlat);
                 }
@@ -364,7 +364,7 @@ OV.NavigatorMeshesPanel = class extends OV.NavigatorPanel
         }
 
         let rootNode = model.GetRootNode ();
-        let meshesItem = CreateNodeItem (this, 'Meshes', 'meshes', rootNode);
+        let meshesItem = CreateNodeItem (this, 'Meshes', rootNode);
         this.treeView.AddItem (meshesItem);
         meshesItem.ShowChildren (true, null);
 
diff --git a/website/o3dv/js/panelset.js b/website/o3dv/js/panelset.js
index a9c7697..6e90b12 100644
--- a/website/o3dv/js/panelset.js
+++ b/website/o3dv/js/panelset.js
@@ -69,6 +69,9 @@ OV.PanelSet = class
 
     ShowPanel (panel)
     {
+        if (panel === this.GetVisiblePanel ()) {
+            return;
+        }
         for (let otherPanel of this.panels) {
             otherPanel.Show (false);
         }