diff --git a/Editor/MeshWindow.cpp b/Editor/MeshWindow.cpp
index 7a131e4dd..0e38d434e 100644
--- a/Editor/MeshWindow.cpp
+++ b/Editor/MeshWindow.cpp
@@ -989,6 +989,11 @@ void MeshWindow::Create(EditorComponent* _editor)
 			mesh->subsets = subsets;
 
 			mesh->CreateRenderData();
+
+			if (mesh->IsBVHEnabled())
+			{
+				mesh->BuildBVH();
+			}
 		}
 		SetEntity(entity, subset);
 	});