diff --git a/include/section_init.inc.php b/include/section_init.inc.php
index 0dd5d13ff..d311b5043 100644
--- a/include/section_init.inc.php
+++ b/include/section_init.inc.php
@@ -611,7 +611,7 @@ elseif ('recent_cats'==$page['section'])
 }
 elseif ('search'==$page['section'])
 {
-  $page['meta_robots']['nofollow']=1;
+  $page['meta_robots']=array('noindex'=>1, 'nofollow'=>1);
 }
 if ( $filter['enabled'] )
 {
diff --git a/themes/default/template/index.tpl b/themes/default/template/index.tpl
index 580defda3..e767e05e0 100644
--- a/themes/default/template/index.tpl
+++ b/themes/default/template/index.tpl
@@ -14,7 +14,7 @@
 	<ul class="categoryActions">
 {if isset($SEARCH_IN_SET_ACTION) and $SEARCH_IN_SET_ACTION}
 	  {combine_css path="themes/default/vendor/fontello/css/gallery-icon.css" order=-10}
-    <li id="cmdSearchInSet"><a href="{$SEARCH_IN_SET_URL}" title="{'Search in this set'|translate}" class="pwg-state-default pwg-button">
+    <li id="cmdSearchInSet"><a href="{$SEARCH_IN_SET_URL}" title="{'Search in this set'|translate}" class="pwg-state-default pwg-button" rel="nofollow">
       <span class="gallery-icon-search-folder"></span><span class="pwg-button-text">{'Search in this set'|translate}</span>
     </a></li>
 {/if}
@@ -160,7 +160,7 @@
 {if isset($SEARCH_IN_SET_BUTTON) and $SEARCH_IN_SET_BUTTON}
 <div class="mcs-side-results search-in-set-button">
   <div>
-    <p><a href="{$SEARCH_IN_SET_URL}" class="gallery-icon-search-folder">{'Search in this set'|translate}</a></p>
+    <p><a href="{$SEARCH_IN_SET_URL}" class="gallery-icon-search-folder" rel="nofollow">{'Search in this set'|translate}</a></p>
   </div>
 </div>
 {/if}