diff --git a/pkg/api/search.go b/pkg/api/search.go
index b1ae9bcc241..b848d2a097c 100644
--- a/pkg/api/search.go
+++ b/pkg/api/search.go
@@ -33,6 +33,11 @@ func setIsStarredFlagOnSearchResults(c *middleware.Context, hits []*m.DashboardS
 func Search(c *middleware.Context) {
 	queryText := c.Query("q")
 	starred := c.Query("starred")
+	limit := c.QueryInt("limit")
+
+	if limit == 0 {
+		limit = 200
+	}
 
 	result := m.SearchResult{
 		Dashboards: []*m.DashboardSearchHit{},
@@ -58,6 +63,7 @@ func Search(c *middleware.Context) {
 			Title:     matches[3],
 			Tag:       matches[2],
 			UserId:    c.UserId,
+			Limit:     limit,
 			IsStarred: starred == "1",
 			AccountId: c.AccountId,
 		}
diff --git a/pkg/models/search.go b/pkg/models/search.go
index e23b5dbd5aa..4f5b24ff084 100644
--- a/pkg/models/search.go
+++ b/pkg/models/search.go
@@ -25,6 +25,7 @@ type SearchDashboardsQuery struct {
 	Tag       string
 	AccountId int64
 	UserId    int64
+	Limit     int
 	IsStarred bool
 
 	Result []*DashboardSearchHit
diff --git a/pkg/services/sqlstore/dashboard.go b/pkg/services/sqlstore/dashboard.go
index f9668731ab5..b3c0495a42f 100644
--- a/pkg/services/sqlstore/dashboard.go
+++ b/pkg/services/sqlstore/dashboard.go
@@ -2,6 +2,7 @@ package sqlstore
 
 import (
 	"bytes"
+	"fmt"
 
 	"github.com/go-xorm/xorm"
 	"github.com/grafana/grafana/pkg/bus"
@@ -116,6 +117,8 @@ func SearchDashboards(query *m.SearchDashboardsQuery) error {
 		params = append(params, query.Tag)
 	}
 
+	sql.WriteString(fmt.Sprintf(" LIMIT %d", query.Limit))
+
 	var res []DashboardSearchProjection
 	err := x.Sql(sql.String(), params...).Find(&res)
 	if err != nil {
diff --git a/src/app/features/account/partials/import.html b/src/app/features/account/partials/import.html
index 28c695ca068..f94b5e7c7e8 100644
--- a/src/app/features/account/partials/import.html
+++ b/src/app/features/account/partials/import.html
@@ -19,18 +19,18 @@
 			<div class="section">
 				<div class="tight-form">
 					<ul class="tight-form-list">
-						<li class="tight-form-item" style="width: 160px">
+						<li class="tight-form-item" style="width: 150px">
 							<strong>Dashboard source</strong>
 						</li>
 						<li>
-							<select type="text" ng-model="sourceName" class="input-small tight-form-input" ng-options="f for f in datasources">
+							<select type="text" ng-model="sourceName" class="input-medium tight-form-input" ng-options="f for f in datasources">
 							</select>
 						</li>
-						<li class="tight-form-item" style="width: 160px">
+						<li class="tight-form-item">
 							<strong>Destination</strong>
 						</li>
 						<li>
-							<select type="text" ng-model="destName" class="input-small tight-form-input" ng-options="f for f in datasources">
+							<select type="text" ng-model="destName" class="input-medium tight-form-input" ng-options="f for f in datasources">
 							</select>
 						</li>
 						<li>
diff --git a/src/app/panels/dashlist/editor.html b/src/app/panels/dashlist/editor.html
index 87a00132827..a6de7570f07 100644
--- a/src/app/panels/dashlist/editor.html
+++ b/src/app/panels/dashlist/editor.html
@@ -39,3 +39,19 @@
 	</div>
 </div>
 
+<div class="editor-row">
+	<div class="section" style="margin-bottom: 20px">
+		<div class="tight-form">
+			<ul class="tight-form-list">
+				<li class="tight-form-item" style="width: 110px">
+					<strong>Limit number to</strong>
+				</li>
+				<li>
+					<input class="input-small tight-form-input" type="number" ng-model="panel.limit" ng-model-onblur ng-change="get_data">
+				</li>
+			</ul>
+			<div class="clearfix"></div>
+		</div>
+	</div>
+</div>
+
diff --git a/src/app/panels/dashlist/module.js b/src/app/panels/dashlist/module.js
index 7dd3aebcc4e..a0f773956bc 100644
--- a/src/app/panels/dashlist/module.js
+++ b/src/app/panels/dashlist/module.js
@@ -31,6 +31,7 @@ function (angular, app, _, config, PanelMeta) {
     var defaults = {
       mode: 'starred',
       query: '',
+      limit: 10,
       tag: '',
     };
 
@@ -51,7 +52,9 @@ function (angular, app, _, config, PanelMeta) {
     };
 
     $scope.get_data = function() {
-      var params = {};
+      var params = {
+        limit: $scope.panel.limit
+      };
       if ($scope.panel.mode === 'starred') {
         params.starred = 1;
       } else {