diff --git a/pkg/api/index.go b/pkg/api/index.go
index e1e3e2c38d7..81edf3b1fe7 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -334,12 +334,11 @@ func (hs *HTTPServer) getNavTree(c *models.ReqContext, hasEditPerm bool) ([]*dto
 	adminNavLinks := hs.buildAdminNavLinks(c)
 
 	if len(adminNavLinks) > 0 {
-		serverAdminNode := navlinks.GetServerAdminNode(adminNavLinks)
+		navSection := dtos.NavSectionCore
 		if hs.Cfg.IsNewNavigationEnabled() {
-			serverAdminNode.Section = dtos.NavSectionConfig
-		} else {
-			serverAdminNode.Section = dtos.NavSectionCore
+			navSection = dtos.NavSectionConfig
 		}
+		serverAdminNode := navlinks.GetServerAdminNode(adminNavLinks, navSection)
 		navTree = append(navTree, serverAdminNode)
 	}
 
diff --git a/pkg/api/navlinks/navlinks.go b/pkg/api/navlinks/navlinks.go
index 3ebe6cdee26..6d7ddfa535b 100644
--- a/pkg/api/navlinks/navlinks.go
+++ b/pkg/api/navlinks/navlinks.go
@@ -2,7 +2,7 @@ package navlinks
 
 import "github.com/grafana/grafana/pkg/api/dtos"
 
-func GetServerAdminNode(children []*dtos.NavLink) *dtos.NavLink {
+func GetServerAdminNode(children []*dtos.NavLink, navSection string) *dtos.NavLink {
 	url := ""
 	if len(children) > 0 {
 		url = children[0].Url
@@ -15,6 +15,7 @@ func GetServerAdminNode(children []*dtos.NavLink) *dtos.NavLink {
 		Icon:         "shield",
 		Url:          url,
 		SortWeight:   dtos.WeightAdmin,
+		Section:      navSection,
 		Children:     children,
 	}
 }