diff --git a/website/o3dv/navigator.js b/website/o3dv/navigator.js
index 4d5794e..1a4449b 100644
--- a/website/o3dv/navigator.js
+++ b/website/o3dv/navigator.js
@@ -220,6 +220,33 @@ OV.Navigator = class
         return meshData.IsVisible ();
     }
 
+    HasHiddenMesh ()
+    {
+        for (let i = 0; i < this.modelData.MeshCount (); i++) {
+            let meshData = this.modelData.GetMeshData (i);
+            if (!meshData.IsVisible ()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    ShowAllMeshes ()
+    {
+        for (let i = 0; i < this.modelData.MeshCount (); i++) {
+            let meshData = this.modelData.GetMeshData (i);
+            meshData.SetVisible (true);
+        }
+        this.callbacks.updateMeshesVisibility ();
+    }
+
+    ToggleMeshVisibility (meshIndex)
+    {
+        let meshData = this.modelData.GetMeshData (meshIndex);
+        meshData.SetVisible (!meshData.IsVisible ());
+        this.callbacks.updateMeshesVisibility ();
+    }
+
     IsMeshIsolated (meshIndex)
     {
         for (let i = 0; i < this.modelData.MeshCount (); i++) {
@@ -245,13 +272,6 @@ OV.Navigator = class
         this.callbacks.updateMeshesVisibility ();
     }
 
-    ToggleMeshVisibility (meshIndex)
-    {
-        let meshData = this.modelData.GetMeshData (meshIndex);
-        meshData.SetVisible (!meshData.IsVisible ());
-        this.callbacks.updateMeshesVisibility ();
-    }
-
     GetSelectedMeshIndex ()
     {
         if (this.tempSelectedMeshIndex !== null) {
diff --git a/website/o3dv/website.js b/website/o3dv/website.js
index 11dde77..edb0fb3 100644
--- a/website/o3dv/website.js
+++ b/website/o3dv/website.js
@@ -151,44 +151,41 @@ OV.Website = class
         let meshUserData = this.viewer.GetMeshUserDataUnderMouse (mouseCoordinates);
         let items = [];
         if (meshUserData === null) {
-            items = [
-                {
-                    name : 'Fit model to window',
-                    onClick : () => {
-                        this.FitModelToWindow (false);
-                    }
+            items.push ({
+                name : 'Fit model to window',
+                onClick : () => {
+                    this.FitModelToWindow (false);
                 }
-            ];
+            });
+            if (this.navigator.HasHiddenMesh ()) {
+                items.push ({
+                    name : 'Show all meshes',
+                    onClick : () => {
+                        this.navigator.ShowAllMeshes ();
+                    }
+                });
+            }
         } else {
             let meshIndex = meshUserData.originalMeshIndex;
-            let isSelectedMesh = (meshIndex === this.navigator.GetSelectedMeshIndex ());
             let isMeshIsolated = this.navigator.IsMeshIsolated (meshIndex);
-            items = [
-                {
-                    name : isSelectedMesh ? 'Deselect mesh' : 'Select mesh',
-                    onClick : () => {
-                        this.navigator.SetSelection (new OV.Selection (OV.SelectionType.Mesh, meshIndex));
-                    }
-                },
-                {
-                    name : 'Hide mesh',
-                    onClick : () => {
-                        this.navigator.ToggleMeshVisibility (meshIndex);
-                    }
-                },
-                {
-                    name : 'Fit mesh to window',
-                    onClick : () => {
-                        this.navigator.FitMeshToWindow (meshIndex);
-                    }
-                },              
-                {
-                    name : isMeshIsolated ? 'Remove isolation' : 'Isolate mesh',
-                    onClick : () => {
-                        this.navigator.IsolateMesh (meshIndex);
-                    }
+            items.push ({
+                name : 'Hide mesh',
+                onClick : () => {
+                    this.navigator.ToggleMeshVisibility (meshIndex);
                 }
-            ];
+            });
+            items.push ({
+                name : 'Fit mesh to window',
+                onClick : () => {
+                    this.navigator.FitMeshToWindow (meshIndex);
+                }
+            });
+            items.push ({
+                name : isMeshIsolated ? 'Remove isolation' : 'Isolate mesh',
+                onClick : () => {
+                    this.navigator.IsolateMesh (meshIndex);
+                }
+            });
         }
         this.dialog = OV.ShowListPopup (items, {
             calculatePosition : (contentDiv) => {