diff --git a/public/app/core/components/search/search.html b/public/app/core/components/search/search.html
index e64ffc845ca..8cf537ac137 100644
--- a/public/app/core/components/search/search.html
+++ b/public/app/core/components/search/search.html
@@ -4,7 +4,7 @@
 <div class="search-container" ng-if="ctrl.isOpen">
 
 	<div class="search-field-wrapper">
-		<div class="search-field-icon">
+		<div class="search-field-icon pointer" ng-click="ctrl.closeSearch()">
 			<i class="fa fa-search"></i>
 		</div>
 
diff --git a/public/sass/components/_search.scss b/public/sass/components/_search.scss
index c5d7d65224f..2190e55f318 100644
--- a/public/sass/components/_search.scss
+++ b/public/sass/components/_search.scss
@@ -10,7 +10,7 @@
 }
 
 .search-container {
-  left: 78px;
+  left: 0;
   top: 0;
   right: 0;
   z-index: ($zindex-modal-backdrop + 10);
@@ -59,6 +59,7 @@
 
 .search-dropdown {
   display: flex;
+  flex-direction: column;
   max-width: 1100px;
   visibility: none;
   opacity: 0;
@@ -163,3 +164,11 @@
   }
 }
 
+@include media-breakpoint-up(md) {
+  .search-dropdown {
+    flex-direction: row;
+  }
+  .search-container {
+    left: 78px;
+  }
+}