diff --git a/admin/themes/default/template/cat_search.tpl b/admin/themes/default/template/cat_search.tpl
index 0e9e312fe..c770ea536 100644
--- a/admin/themes/default/template/cat_search.tpl
+++ b/admin/themes/default/template/cat_search.tpl
@@ -87,6 +87,7 @@ function resultAppear(result) {
 }
 
 updateSearch();
+$('.search-input').focus();
 {/literal}
 {/footer_script}
 
@@ -95,14 +96,14 @@ updateSearch();
 </div>
 
 <div class="search-album">
-  <div class="search-album-label">{'Search'|@translate}</div>
+  <div class="search-album-label">{'Search albums'|@translate}</div>
   <div class="search-album-input-container" style="position:relative">
     <span class="icon-search search-icon"></span>
     <span class="icon-cancel search-cancel"></span>
-    <input class='search-input' type="text" placeholder="{'Portraits...'|@translate}">
+    <input class='search-input' type="text" placeholder="{'Portraits'|@translate}">
   </div>
+  <span class="search-album-help  icon-help-circled" title="{' Enter a term to search for album'|@translate}"></span>
 </div>
-<div class="search-album-help  icon-help-circled">{' Enter a term to search from album'|@translate}</div>
 
 <div class="search-album-ghost">
   <div></div>
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css
index 5f87d0cd2..8397a8db4 100644
--- a/admin/themes/default/theme.css
+++ b/admin/themes/default/theme.css
@@ -4696,6 +4696,8 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important;
   display: flex;
   justify-content: center;
   align-items: center;
+  margin: 10px;
+  margin-bottom: 25px
 }
 
 .search-album-label {
@@ -4714,9 +4716,9 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important;
 }
 
 .search-album-help {
-  text-align: center;
-  margin: 10px;
-  font-size: 14px;
+  cursor: help;
+  margin: 5px;
+  font-size: 20px;
 }
 
 .search-album-ghost, .search-album-result {
@@ -4806,5 +4808,6 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important;
   font-weight: bold;
   font-size: 30px;
   position: absolute;
+  top: calc(50% + 200px / 2);
   display: none;
 }
\ No newline at end of file