diff --git a/src/app/routes/p_dashboard.js b/src/app/routes/p_dashboard.js
index 08c729c2a8c..ef5da131e2f 100644
--- a/src/app/routes/p_dashboard.js
+++ b/src/app/routes/p_dashboard.js
@@ -13,7 +13,7 @@ function (angular) {
         controller : 'DashFromDBProvider',
         reloadOnSearch: false,
       })
-      .when('/dashboard/db/:id', {
+      .when('/dashboard/:id', {
         templateUrl: '/app/partials/dashboard.html',
         controller : 'DashFromDBProvider',
         reloadOnSearch: false,
@@ -38,6 +38,7 @@ function (angular) {
         $scope.emitAppEvent('setup-dashboard', dashboard);
       }).then(null, function(error) {
         alertSrv.set('Error', error, 'error');
+        $scope.emitAppEvent('setup-dashboard', {});
       });
 
   });
diff --git a/src/app/services/grafana/grafanaDatasource.js b/src/app/services/grafana/grafanaDatasource.js
index 3a519208ac1..9b83e4f3673 100644
--- a/src/app/services/grafana/grafanaDatasource.js
+++ b/src/app/services/grafana/grafanaDatasource.js
@@ -48,8 +48,8 @@ function (angular) {
       }
 
       return $http.post('/api/dashboard/', { dashboard: dashboard })
-        .then(function() {
-          return { title: dashboard.title, url: '/dashboard/db/' + dashboard.title };
+        .then(function(result) {
+          return { title: dashboard.title, url: '/dashboard/' + result.data.slug };
         }, function(data) {
           throw "Failed to search: " + data;
         });