diff --git a/pkg/services/sqlstore/dashboard_test.go b/pkg/services/sqlstore/dashboard_test.go
index e6734fd5ee3..b8f915f7245 100644
--- a/pkg/services/sqlstore/dashboard_test.go
+++ b/pkg/services/sqlstore/dashboard_test.go
@@ -381,10 +381,11 @@ func TestDashboardDataAccess(t *testing.T) {
 			childDash2 := insertTestDashboard("child dash 2", 1, folder2.Id, false, "prod")
 
 			currentUser := createUser("viewer", "Viewer", false)
+			var rootFolderId int64 = 0
 
 			Convey("and one folder is expanded, the other collapsed", func() {
 				Convey("should return dashboards in root and expanded folder", func() {
-					query := &search.FindPersistedDashboardsQuery{FolderIds: []int64{folder1.Id}, SignedInUser: &m.SignedInUser{UserId: currentUser.Id, OrgId: 1}, OrgId: 1}
+					query := &search.FindPersistedDashboardsQuery{FolderIds: []int64{rootFolderId, folder1.Id}, SignedInUser: &m.SignedInUser{UserId: currentUser.Id, OrgId: 1}, OrgId: 1}
 					err := SearchDashboards(query)
 					So(err, ShouldBeNil)
 					So(len(query.Result), ShouldEqual, 4)
diff --git a/public/app/core/services/search_srv.ts b/public/app/core/services/search_srv.ts
index 4b32c2735bf..3d85cb20005 100644
--- a/public/app/core/services/search_srv.ts
+++ b/public/app/core/services/search_srv.ts
@@ -52,7 +52,7 @@ export class SearchSrv {
   }
 
   search(options) {
-    if (!options.query) {
+    if (!options.query && !options.tag) {
       return this.browse();
     }
 
diff --git a/public/app/features/dashboard/dashboard_list_ctrl.ts b/public/app/features/dashboard/dashboard_list_ctrl.ts
index 032e8d7ffa0..ace7d8065a7 100644
--- a/public/app/features/dashboard/dashboard_list_ctrl.ts
+++ b/public/app/features/dashboard/dashboard_list_ctrl.ts
@@ -5,6 +5,7 @@ import { SearchSrv } from 'app/core/services/search_srv';
 export class DashboardListCtrl {
   public sections: any [];
   tags: any [];
+  selectedTagFilter: any;
   query: any;
   navModel: any;
   canDelete = false;
@@ -15,27 +16,40 @@ export class DashboardListCtrl {
     this.navModel = navModelSrv.getNav('dashboards', 'dashboards');
     this.query = {query: '', mode: 'tree', tag: []};
 
-    this.getDashboards();
-    // this.getDashboards().then(() => {
-    //   this.getTags();
-    // });
+    this.getDashboards().then(() => {
+      this.getTags();
+    });
   }
 
   getDashboards() {
-    return this.searchSrv.browse().then((result) => {
+    if (this.query.query.length === 0 && this.query.tag.length === 0) {
+      return this.searchSrv.browse().then((result) => {
+        return this.initDashboardList(result);
+      });
+    }
 
-      this.sections = result;
-
-      for (let section of this.sections) {
-        section.checked = false;
-
-        for (let dashboard of section.items) {
-          dashboard.checked = false;
-        }
-      }
+    return this.searchSrv.search(this.query).then((result) => {
+      return this.initDashboardList(result);
     });
   }
 
+  initDashboardList(result: any) {
+    if (!result) {
+      this.sections = [];
+      return;
+    }
+
+    this.sections = result;
+
+    for (let section of this.sections) {
+      section.checked = false;
+
+      for (let dashboard of section.items) {
+        dashboard.checked = false;
+      }
+    }
+  }
+
   selectionChanged() {
 
     let selectedDashboards = 0;
@@ -119,11 +133,16 @@ export class DashboardListCtrl {
     });
   }
 
-  // getTags() {
-  //   return this.backendSrv.get('/api/dashboards/tags').then((results) => {
-  //     this.tags = results;
-  //   });
-  // }
+  toggleFolder(section) {
+    return this.searchSrv.toggleFolder(section);
+  }
+
+  getTags() {
+    return this.searchSrv.getDashboardTags().then((results) => {
+      this.tags =  [{ term: 'Filter By Tag', disabled: true }].concat(results);
+      this.selectedTagFilter = this.tags[0];
+    });
+  }
 
   filterByTag(tag, evt) {
     this.query.tag.push(tag);
@@ -134,6 +153,12 @@ export class DashboardListCtrl {
     }
   }
 
+  filterChange() {
+    this.query.tag.push(this.selectedTagFilter.term);
+    this.selectedTagFilter = this.tags[0];
+    this.getDashboards();
+  }
+
   removeTag(tag, evt) {
     this.query.tag = _.without(this.query.tag, tag);
     this.getDashboards();
diff --git a/public/app/features/dashboard/partials/dashboardList.html b/public/app/features/dashboard/partials/dashboardList.html
index 104861af637..b5f0fabeef4 100644
--- a/public/app/features/dashboard/partials/dashboardList.html
+++ b/public/app/features/dashboard/partials/dashboardList.html
@@ -54,23 +54,31 @@
         <div class="admin-list-table" style="height: 80%">
           <div gemini-scrollbar>
             <div ng-show="ctrl.sections.length > 0">
-              <!-- <div>
-                <select class="gf-form-input" ng-model="ctrl.query.tags" ng-options="t.term for t in ctrl.tags" />
-              </div> -->
+              <div>
+                <select
+                  class="gf-form-input"
+                  ng-model="ctrl.selectedTagFilter"
+                  ng-options="t.term disable when t.disabled for t in ctrl.tags"
+                  ng-change="ctrl.filterChange(tag, $index)"
+                />
+              </div>
               <div ng-repeat="section in ctrl.sections" class="search-section">
-                <gf-form-switch
-                  switch-class="gf-form-switch--table-cell"
-                  on-change="ctrl.selectionChanged()"
-                  checked="section.checked">
-                </gf-form-switch>
-                <a class="search-section__header pointer" ng-show="::section.title" ng-click="section.collapsed = !section.collapsed">
-                  <i class="search-section__header__icon" ng-class="section.icon"></i>
-                  <span class="search-section__header__text">{{::section.title}}</span>
-                  <i class="fa fa-minus search-section__header__toggle" ng-hide="section.collapsed"></i>
-                  <i class="fa fa-plus search-section__header__toggle" ng-show="section.collapsed"></i>
-                </a>
 
-                <div ng-if="!section.collapsed">
+                <div class="search-section__header pointer" ng-show="::section.title">
+                  <gf-form-switch
+                    switch-class="gf-form-switch--table-cell"
+                    on-change="ctrl.selectionChanged()"
+                    checked="section.checked">
+                  </gf-form-switch>
+                  <a ng-click="ctrl.toggleFolder(section)">
+                    <i class="search-section__header__icon" ng-class="section.icon"></i>
+                    <span class="search-section__header__text">{{::section.title}}</span>
+                    <i class="fa fa-minus search-section__header__toggle" ng-show="section.expanded"></i>
+                    <i class="fa fa-plus search-section__header__toggle" ng-hide="section.expanded"></i>
+                  </a>
+                </div>
+
+                <div ng-if="section.expanded">
                   <div ng-repeat="item in section.items" class="search-item" ng-class="{'selected': item.selected}">
                     <gf-form-switch
                       switch-class="gf-form-switch--table-cell"
@@ -124,7 +132,7 @@
           </div>
         </div>
 
-      <em class="muted" ng-hide="ctrl.dashboards.length > 0">
+      <em class="muted" ng-hide="ctrl.sections.length > 0">
         No Dashboards or Folders found.
       </em>
     </div>
diff --git a/public/app/features/dashboard/specs/dashboard_list_ctrl.jest.ts b/public/app/features/dashboard/specs/dashboard_list_ctrl.jest.ts
index ea1e1d6ea00..dd9fb7f6caf 100644
--- a/public/app/features/dashboard/specs/dashboard_list_ctrl.jest.ts
+++ b/public/app/features/dashboard/specs/dashboard_list_ctrl.jest.ts
@@ -61,6 +61,63 @@ describe('DashboardListCtrl', () => {
     });
   });
 
+  describe('when searching dashboards', () => {
+    beforeEach(() => {
+      const response = [
+        {
+          id: 410,
+          title: "afolder",
+          type: "dash-folder",
+          items: [
+            {
+              id: 399,
+              title: "Dashboard Test",
+              url: "dashboard/db/dashboard-test",
+              icon: 'fa fa-folder',
+              tags: [],
+              isStarred: false,
+              folderId: 410,
+              folderTitle: "afolder",
+              folderSlug: "afolder"
+            }
+          ],
+          tags: [],
+          isStarred: false
+        },
+        {
+          id: 0,
+          title: "Root",
+          icon: 'fa fa-folder-open',
+          uri: "db/something-else",
+          type: "dash-db",
+          items: [
+            {
+              id: 500,
+              title: "Dashboard Test",
+              url: "dashboard/db/dashboard-test",
+              icon: 'fa fa-folder',
+              tags: [],
+              isStarred: false
+            }
+          ],
+          tags: [],
+          isStarred: false,
+        }
+      ];
+      ctrl = createCtrlWithStubs(response);
+      ctrl.query.query = 'd';
+      return ctrl.getDashboards();
+    });
+
+    it('should set checked to false on all sections and children', () => {
+      expect(ctrl.sections.length).toEqual(2);
+      expect(ctrl.sections[0].checked).toEqual(false);
+      expect(ctrl.sections[0].items[0].checked).toEqual(false);
+      expect(ctrl.sections[1].checked).toEqual(false);
+      expect(ctrl.sections[1].items[0].checked).toEqual(false);
+    });
+  });
+
   describe('when selecting dashboards', () => {
     let ctrl;