diff --git a/pkg/api/api.go b/pkg/api/api.go
index 7ca90636284..d25e0a44dfc 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -373,7 +373,7 @@ func (hs *HTTPServer) registerRoutes() {
 
 		// Search
 		apiRoute.Get("/search/sorting", routing.Wrap(hs.ListSortOptions))
-		apiRoute.Get("/search/", routing.Wrap(Search))
+		apiRoute.Get("/search/", routing.Wrap(hs.Search))
 
 		// metrics
 		apiRoute.Post("/tsdb/query", authorize(reqSignedIn, ac.EvalPermission(ActionDatasourcesQuery)), routing.Wrap(hs.QueryMetrics))
diff --git a/pkg/api/search.go b/pkg/api/search.go
index fa691138967..2f1a2cbf407 100644
--- a/pkg/api/search.go
+++ b/pkg/api/search.go
@@ -7,13 +7,12 @@ import (
 	"github.com/grafana/grafana/pkg/util"
 
 	"github.com/grafana/grafana/pkg/api/response"
-	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/search"
 )
 
-func Search(c *models.ReqContext) response.Response {
+func (hs *HTTPServer) Search(c *models.ReqContext) response.Response {
 	query := c.Query("query")
 	tags := c.QueryStrings("tag")
 	starred := c.Query("starred")
@@ -62,7 +61,7 @@ func Search(c *models.ReqContext) response.Response {
 		Sort:         sort,
 	}
 
-	err := bus.Dispatch(c.Req.Context(), &searchQuery)
+	err := hs.SearchService.SearchHandler(c.Req.Context(), &searchQuery)
 	if err != nil {
 		return response.Error(500, "Search failed", err)
 	}
diff --git a/pkg/services/search/service.go b/pkg/services/search/service.go
index 42e0a224ec1..77bf654f02c 100644
--- a/pkg/services/search/service.go
+++ b/pkg/services/search/service.go
@@ -60,9 +60,8 @@ type FindPersistedDashboardsQuery struct {
 }
 
 type SearchService struct {
-	Bus bus.Bus
-	Cfg *setting.Cfg
-
+	Bus         bus.Bus
+	Cfg         *setting.Cfg
 	sortOptions map[string]SortOption
 }