diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsearch.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsearch.directive.js
index 7affebefe5..7ff76d5670 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsearch.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsearch.directive.js
@@ -24,12 +24,13 @@
         vm.clearSearch = clearSearch;
         vm.handleKeyUp = handleKeyUp;
         vm.closeSearch = closeSearch;
+        vm.focusSearch = focusSearch;
 
         function onInit() {
             vm.searchQuery = "";
             vm.searchResults = [];
             vm.hasResults = false;
-            vm.focusSearch = true;
+            focusSearch();
             backdropService.open();
         }
 
@@ -48,12 +49,19 @@
          * Clears the search query
          */
         function clearSearch() {
-            vm.focusSearch = false;
             vm.searchQuery = "";
+            vm.searchResults = [];
+            vm.hasResults = false;
+            focusSearch();
+        }
+
+        /**
+         * Add focus to the search field
+         */
+        function focusSearch() {
+            vm.searchHasFocus = false;
             $timeout(function(){
-                vm.focusSearch  = true;
-                vm.searchResults = [];
-                vm.hasResults = false;
+                vm.searchHasFocus  = true;
             });
         }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-search.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-search.less
index b65d08711b..a8fc9c7f8e 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-search.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-search.less
@@ -24,6 +24,9 @@
     font-size: 22px;
     color: @gray-7;
     padding-left: 20px;
+    display: flex;
+    align-items: center;
+    height: 70px;
 }
 
 .umb-search-input.umb-search-input {