diff --git a/Engine/source/navigation/navMesh.cpp b/Engine/source/navigation/navMesh.cpp
index f1476e3e3..b9421e3a3 100644
--- a/Engine/source/navigation/navMesh.cpp
+++ b/Engine/source/navigation/navMesh.cpp
@@ -1592,8 +1592,6 @@ void NavMesh::renderToDrawer()
             duDebugDrawNavMeshBVTree(&mDbgDraw, *n->nm);
          if(m_drawMode == DRAWMODE_NAVMESH_PORTALS)
             duDebugDrawNavMeshPortals(&mDbgDraw, *n->nm);
-         if (m_drawMode == DRAWMODE_NAVMESH_NODES)
-            duDebugDrawNavMeshNodes(&mDbgDraw, *n->mQuery);
       }
 
       mDbgDraw.depthMask(true, false);
@@ -1754,6 +1752,15 @@ void NavMesh::renderLinks(duDebugDraw &dd)
    dd.end();
 }
 
+void NavMesh::renderSearch(duDebugDraw& dd)
+{
+   if (mQuery == NULL)
+      return;
+
+   if (m_drawMode == DRAWMODE_NAVMESH_NODES)
+      duDebugDrawNavMeshNodes(&dd, *mQuery);
+}
+
 void NavMesh::renderTileData(duDebugDrawTorque &dd, U32 tile)
 {
    if (tile > mTiles.size())
diff --git a/Engine/source/navigation/navMesh.h b/Engine/source/navigation/navMesh.h
index 61db2a32f..789425ca7 100644
--- a/Engine/source/navigation/navMesh.h
+++ b/Engine/source/navigation/navMesh.h
@@ -266,6 +266,7 @@ public:
    void prepRenderImage(SceneRenderState *state) override;
    void render(ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance *overrideMat);
    void renderLinks(duDebugDraw &dd);
+   void renderSearch(duDebugDraw& dd);
    void renderTileData(duDebugDrawTorque &dd, U32 tile);
 
    bool mAlwaysRender;
diff --git a/Engine/source/navigation/navMeshTools/navMeshTestTool.cpp b/Engine/source/navigation/navMeshTools/navMeshTestTool.cpp
index 90292df84..b2612a841 100644
--- a/Engine/source/navigation/navMeshTools/navMeshTestTool.cpp
+++ b/Engine/source/navigation/navMeshTools/navMeshTestTool.cpp
@@ -331,6 +331,8 @@ void NavMeshTestTool::onRender3D()
    }
    dd.depthMask(true);
 
+   mNavMesh->renderSearch(dd);
+
    dd.immediateRender();
 
    if (!mCurFollowObject.isNull())