Index: root/projects/slingshot/config/alfresco/site-webscripts/org/alfresco/components/search/advsearch.get.js
===================================================================
--- root/projects/slingshot/config/alfresco/site-webscripts/org/alfresco/components/search/advsearch.get.js	(revision 72986)
+++ root/projects/slingshot/config/alfresco/site-webscripts/org/alfresco/components/search/advsearch.get.js	(working copy)
@@ -56,7 +56,7 @@
    // Prepare the model
    var repoconfig = config.scoped['Search']['search'].getChildValue('repository-search');
    // config override can force repository search on/off
-   model.searchRepo = (repoconfig != "none");
+   model.searchRepo = ((page.url.templateArgs["site"] == null) || repoconfig == "always") && repoconfig != "none";
    model.siteId = siteId;
    model.searchForms = searchForms;
    
Index: root/projects/slingshot/config/alfresco/site-webscripts/org/alfresco/components/search/search.get.html.ftl
===================================================================
--- root/projects/slingshot/config/alfresco/site-webscripts/org/alfresco/components/search/search.get.html.ftl	(revision 72986)
+++ root/projects/slingshot/config/alfresco/site-webscripts/org/alfresco/components/search/search.get.html.ftl	(working copy)
@@ -18,7 +18,7 @@
       <#assign el=args.htmlid>
       <#assign searchconfig=config.scoped['Search']['search']>
       <div id="${el}-body" class="search">
-         <#if searchQuery?length == 0 && (searchconfig.getChildValue('repository-search')!"context") != "always">
+         <#if (searchconfig.getChildValue('repository-search')!"context") != "always">
          <div class="search-sites">
             <#if siteId?length != 0><a id="${el}-site-link" href="#" <#if !searchAllSites && !searchRepo>class="bold"</#if>>${msg('message.singlesite', siteTitle)?html}</a> |</#if>
             <a id="${el}-all-sites-link" href="#" <#if searchAllSites && !searchRepo>class="bold"</#if>>${msg('message.allsites')}</a>
Index: root/projects/slingshot/source/web/components/search/search.js
===================================================================
--- root/projects/slingshot/source/web/components/search/search.js	(revision 72986)
+++ root/projects/slingshot/source/web/components/search/search.js	(working copy)
@@ -980,7 +980,7 @@
          }
          
          // apply the context
-         if (this.searchRepository || this.options.searchQuery.length !== 0)
+         if (this.searchRepository)
          {
             text += ' ' + this.msg("search.info.foundinrepository");
          }