diff --git a/pkg/api/index.go b/pkg/api/index.go
index 3fdd6152068..7d9e0da8f9d 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -327,10 +327,6 @@ func (hs *HTTPServer) getNavTree(c *models.ReqContext, hasEditPerm bool) ([]*dto
 		Children:     []*dtos.NavLink{},
 	})
 
-	sort.SliceStable(navTree, func(i, j int) bool {
-		return navTree[i].SortWeight < navTree[j].SortWeight
-	})
-
 	return navTree, nil
 }
 
@@ -434,6 +430,10 @@ func (hs *HTTPServer) setIndexViewData(c *models.ReqContext) (*dtos.IndexViewDat
 
 	hs.HooksService.RunIndexDataHooks(&data, c)
 
+	sort.SliceStable(data.NavTree, func(i, j int) bool {
+		return data.NavTree[i].SortWeight < data.NavTree[j].SortWeight
+	})
+
 	return &data, nil
 }