diff --git a/pkg/services/sqlstore/dashboard.go b/pkg/services/sqlstore/dashboard.go
index fcc49799def..7eb9845a4df 100644
--- a/pkg/services/sqlstore/dashboard.go
+++ b/pkg/services/sqlstore/dashboard.go
@@ -202,7 +202,6 @@ func findDashboards(query *search.FindPersistedDashboardsQuery) ([]DashboardSear
 		dashboard.title,
 		dashboard.slug,
 		dashboard_tag.term,
-		dashboard.is_folder,
 		dashboard.folder_id,
 		folder.slug as folder_slug,
 		folder.title as folder_title
diff --git a/public/app/core/components/search/search.html b/public/app/core/components/search/search.html
index 668201b1574..ba49fa6851f 100644
--- a/public/app/core/components/search/search.html
+++ b/public/app/core/components/search/search.html
@@ -59,7 +59,8 @@
 					<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"></i>
+						<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">
diff --git a/public/app/core/components/search/search.ts b/public/app/core/components/search/search.ts
index e0f383988bf..020a7fe901a 100644
--- a/public/app/core/components/search/search.ts
+++ b/public/app/core/components/search/search.ts
@@ -132,9 +132,15 @@ export class SearchCtrl {
         if (!section) {
           section = {
             id: hit.folderId,
-            title: hit.folderTitle, items: [],
+            title: hit.folderTitle,
+            items: [],
             icon: 'fa fa-folder-open'
           };
+          // handle root
+          if (!hit.folderId) {
+            section.title = "Dashboards";
+            section.icon = "fa fa-circle-o";
+          }
           sections[hit.folderId] = section;
         }
 
diff --git a/public/sass/components/_modals.scss b/public/sass/components/_modals.scss
index 14713fbda74..137afc11bd7 100644
--- a/public/sass/components/_modals.scss
+++ b/public/sass/components/_modals.scss
@@ -21,7 +21,6 @@
 // Base modal
 .modal {
   position: fixed;
-  overflow: hidden;
   z-index: $zindex-modal;
   width: 100%;
 	background-color: $panel-bg;
diff --git a/public/sass/components/_search.scss b/public/sass/components/_search.scss
index e82c99210ed..796db537589 100644
--- a/public/sass/components/_search.scss
+++ b/public/sass/components/_search.scss
@@ -134,13 +134,13 @@
     background-color: $tight-form-func-bg;
   }
 
-  .fa-star, .fa-star-o {
-    padding-left: 13px;
-  }
-
-  .fa-star {
-    color: $orange;
-  }
+  // .fa-star, .fa-star-o {
+  //   padding-left: 13px;
+  // }
+  //
+  // .fa-star {
+  //   color: $orange;
+  // }
 }
 
 .search-item__title {
@@ -154,6 +154,7 @@
   padding: 5px;
   flex: 0 0 auto;
   font-size: 19px;
+  padding: 5px 2px 5px 10px;
 }
 
 .search-item__tags {