diff --git a/pkg/api/index.go b/pkg/api/index.go
index 1a086f5fe0d..5beecefab88 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -261,7 +261,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
 
 		if c.IsGrafanaAdmin {
 			cfgNode.Children = append(cfgNode.Children, &dtos.NavLink{
-				Divider: true, HideFromTabs: true,
+				Divider: true, HideFromTabs: true, Id: "admin-divider", Text: "Text",
 			})
 			cfgNode.Children = append(cfgNode.Children, &dtos.NavLink{
 				Text:         "Server Admin",
diff --git a/public/app/features/plugins/ds_dashboards_ctrl.ts b/public/app/features/plugins/ds_dashboards_ctrl.ts
index 950fe2a04bd..ed7800698b7 100644
--- a/public/app/features/plugins/ds_dashboards_ctrl.ts
+++ b/public/app/features/plugins/ds_dashboards_ctrl.ts
@@ -9,6 +9,12 @@ export class DataSourceDashboardsCtrl {
 
   /** @ngInject */
   constructor(private backendSrv, private $routeParams) {
+    if (store.nav.main === null) {
+      store.nav.load('cfg', 'datasources');
+    }
+
+    this.navModel = toJS(store.nav);
+
     if (this.$routeParams.id) {
       this.getDatasourceById(this.$routeParams.id);
     }
diff --git a/public/app/features/plugins/ds_edit_ctrl.ts b/public/app/features/plugins/ds_edit_ctrl.ts
index b3de80d8bba..b98f0f48910 100644
--- a/public/app/features/plugins/ds_edit_ctrl.ts
+++ b/public/app/features/plugins/ds_edit_ctrl.ts
@@ -29,15 +29,12 @@ export class DataSourceEditCtrl {
   navModel: any;
 
   /** @ngInject */
-  constructor(
-    private $q,
-    private backendSrv,
-    private $routeParams,
-    private $location,
-    private datasourceSrv,
-    navModelSrv
-  ) {
-    this.navModel = navModelSrv.getNav('cfg', 'datasources', 0);
+  constructor(private $q, private backendSrv, private $routeParams, private $location, private datasourceSrv) {
+    if (store.nav.main === null) {
+      store.nav.load('cfg', 'datasources');
+    }
+
+    this.navModel = toJS(store.nav);
     this.datasources = [];
 
     this.loadDatasourceTypes().then(() => {
diff --git a/public/app/features/plugins/partials/ds_dashboards.html b/public/app/features/plugins/partials/ds_dashboards.html
index 50be10819b5..a442e37d1f6 100644
--- a/public/app/features/plugins/partials/ds_dashboards.html
+++ b/public/app/features/plugins/partials/ds_dashboards.html
@@ -1,10 +1,7 @@
 <page-header model="ctrl.navModel"></page-header>
 
-<div class="page-container page-body">
+<div class="page-container page-body" ng-if="ctrl.datasourceMeta">
 
-	<h3 class="page-heading">Bundled Plugin Dashboards</h3>
-	<div class="section">
-		<dashboard-import-list plugin="ctrl.datasourceMeta" datasource="ctrl.current"></dashboard-import-list>
-	</div>
+	<dashboard-import-list plugin="ctrl.datasourceMeta" datasource="ctrl.current"></dashboard-import-list>
 
 </div>
diff --git a/public/app/routes/routes.ts b/public/app/routes/routes.ts
index 917c80c0e7a..57908bd50cb 100644
--- a/public/app/routes/routes.ts
+++ b/public/app/routes/routes.ts
@@ -50,7 +50,7 @@ export function setupAngularRoutes($routeProvider, $locationProvider) {
     })
     .when('/datasources/edit/:id/dashboards', {
       templateUrl: 'public/app/features/plugins/partials/ds_dashboards.html',
-      controller: 'DataSourceEditCtrl',
+      controller: 'DataSourceDashboardsCtrl',
       controllerAs: 'ctrl',
     })
     .when('/datasources/new', {