diff --git a/Engine/source/navigation/navMeshTools/navMeshSelectTool.h b/Engine/source/navigation/navMeshTools/navMeshSelectTool.h
index ff2ad8769..521a23fe8 100644
--- a/Engine/source/navigation/navMeshTools/navMeshSelectTool.h
+++ b/Engine/source/navigation/navMeshTools/navMeshSelectTool.h
@@ -18,6 +18,7 @@ public:
    NavMeshSelectTool();
    virtual ~NavMeshSelectTool() {}
 
+   void setActiveNavMesh(NavMesh* nav_mesh) { mNavMesh = nav_mesh; mSelMesh = nav_mesh; }
    void onActivated(const Gui3DMouseEvent& evt) override;
    void onDeactivated() override;
 
diff --git a/Templates/BaseGame/game/tools/navEditor/navEditor.tscript b/Templates/BaseGame/game/tools/navEditor/navEditor.tscript
index 3d72f307d..3a501cddd 100644
--- a/Templates/BaseGame/game/tools/navEditor/navEditor.tscript
+++ b/Templates/BaseGame/game/tools/navEditor/navEditor.tscript
@@ -698,6 +698,8 @@ function NavTreeView::onInspect(%this, %obj)
 function NavTreeView::onSelect(%this, %obj)
 {
    NavInspector.inspect(%obj);
+   
+   NavEditorGui.selectMesh(%obj);
 }
 
 function NavEditorGui::prepSelectionMode(%this)