diff --git a/src/app/features/panellinkeditor/linkSrv.js b/src/app/features/panellinkeditor/linkSrv.js
index 8d06b22b99d..b877a76a0fa 100644
--- a/src/app/features/panellinkeditor/linkSrv.js
+++ b/src/app/features/panellinkeditor/linkSrv.js
@@ -21,7 +21,7 @@ function (angular, kbn) {
         else {
           info.title = templateSrv.replace(link.title || '');
           var slug = kbn.slugifyForUrl(link.dashboard || '');
-          info.href = '#dashboard/db/' + slug + '?';
+          info.href = 'dashboard/db/' + slug + '?';
         }
 
         var range = timeSrv.timeRangeForUrl();
diff --git a/src/app/features/panellinkeditor/module.js b/src/app/features/panellinkeditor/module.js
index 3052466d1d1..b5853d01b9b 100644
--- a/src/app/features/panellinkeditor/module.js
+++ b/src/app/features/panellinkeditor/module.js
@@ -19,7 +19,7 @@ function (angular, _) {
         link: function() {
         }
       };
-    }).controller('PanelLinkEditorCtrl', function($scope, datasourceSrv) {
+    }).controller('PanelLinkEditorCtrl', function($scope, backendSrv) {
 
       $scope.panel.links = $scope.panel.links || [];
 
@@ -30,11 +30,10 @@ function (angular, _) {
         });
       };
 
-      $scope.searchDashboards = function(query, callback) {
-        var ds = datasourceSrv.getGrafanaDB();
-        if (ds === null) { return; }
+      $scope.searchDashboards = function(queryStr, callback) {
+        var query = {query: queryStr};
 
-        ds.searchDashboards(query).then(function(result) {
+        backendSrv.search(query).then(function(result) {
           var dashboards = _.map(result.dashboards, function(dash) {
             return dash.title;
           });