diff --git a/source/website/navigatormeshespanel.js b/source/website/navigatormeshespanel.js
index e84345f..1930338 100644
--- a/source/website/navigatormeshespanel.js
+++ b/source/website/navigatormeshespanel.js
@@ -146,7 +146,7 @@ export class NavigatorMeshesPanel extends NavigatorPanel
         const rootNode = importResult.model.GetRootNode ();
         let isHierarchical = false;
         for (let childNode of rootNode.GetChildNodes ()) {
-            if (childNode.ChildNodeCount () > 0) {
+            if (childNode.ChildNodeCount () > 0 || childNode.MeshIndexCount () > 1) {
                 isHierarchical = true;
                 break;
             }
diff --git a/source/website/utils.js b/source/website/utils.js
index 94e03de..a51592f 100644
--- a/source/website/utils.js
+++ b/source/website/utils.js
@@ -17,7 +17,7 @@ export function GetNodeName (originalName)
 
 export function GetMeshName (originalNodeName, originalMeshName)
 {
-    let originalName = (originalMeshName.length > 0 ? originalMeshName : originalNodeName);
+    let originalName = (originalNodeName.length > 0 ? originalNodeName : originalMeshName);
     return GetNameOrDefault (originalName, 'No Name');
 }