diff --git a/website/o3dv/js/navigator.js b/website/o3dv/js/navigator.js
index b495c05..be6e1b7 100644
--- a/website/o3dv/js/navigator.js
+++ b/website/o3dv/js/navigator.js
@@ -214,12 +214,12 @@ OV.Navigator = class
         function SetEntitySelection (navigator, selection, select)
         {
             if (selection.type === OV.SelectionType.Material) {
-                if (select) {
+                if (select && navigator.panelSet.IsPanelsVisible ()) {
                     navigator.panelSet.ShowPanel (navigator.materialsPanel);
                 }
                 navigator.materialsPanel.SelectMaterialItem (selection.materialIndex, select);
             } else if (selection.type === OV.SelectionType.Mesh) {
-                if (select) {
+                if (select && navigator.panelSet.IsPanelsVisible ()) {
                     navigator.panelSet.ShowPanel (navigator.meshesPanel);
                 }
                 navigator.meshesPanel.GetMeshItem (selection.meshInstanceId).SetSelected (select);
diff --git a/website/o3dv/js/panelset.js b/website/o3dv/js/panelset.js
index 6fcd3f3..5d32bde 100644
--- a/website/o3dv/js/panelset.js
+++ b/website/o3dv/js/panelset.js
@@ -110,8 +110,11 @@ OV.PanelSet = class
             this.contentDiv.show ();
             this.parentDiv.outerWidth (this.menuDiv.outerWidth (true) + this.panelsPrevWidth, true);
         } else {
-            for (let otherPanelButton of this.panelButtons) {
-                otherPanelButton.removeClass ('selected');
+            for (let panelButton of this.panelButtons) {
+                panelButton.removeClass ('selected');
+            }
+            for (let panel of this.panels) {
+                panel.Show (false);
             }
             this.panelsPrevWidth = this.contentDiv.outerWidth (true);
             this.parentDiv.outerWidth (this.menuDiv.outerWidth (true), true);
@@ -124,17 +127,23 @@ OV.PanelSet = class
 
     ShowPanel (panel)
     {
-        for (let otherPanel of this.panels) {
-            otherPanel.Show (false);
-        }
-
-        for (let otherPanelButton of this.panelButtons) {
-            otherPanelButton.removeClass ('selected');
+        if (panel === this.GetVisiblePanel ()) {
+            return;
         }
 
         let panelButton = this.GetPanelButton (panel);
+        for (let otherPanelButton of this.panelButtons) {
+            if (otherPanelButton !== panelButton) {
+                otherPanelButton.removeClass ('selected');
+            }
+        }
         panelButton.addClass ('selected');
 
+        for (let otherPanel of this.panels) {
+            if (otherPanel !== panel) {
+                otherPanel.Show (false);
+            }
+        }
         panel.Show (true);
         panel.Resize ();
     }
@@ -168,12 +177,17 @@ OV.PanelSet = class
     {
         if (this.requestedPanelsVisible !== this.panelsVisible) {
             this.ShowPanels (this.requestedPanelsVisible);
+            return;
         }
         let height = this.parentDiv.height ();
         this.menuDiv.outerHeight (height, true);
         this.contentDiv.outerHeight (height, true);
-        for (let panel of this.panels) {
-            panel.Resize ();
+        if (this.panelsVisible) {
+            for (let panel of this.panels) {
+                if (panel.IsVisible ()) {
+                    panel.Resize ();
+                }
+            }
         }
     }