diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
index 85d2d706e8..15f0d25b8e 100644
--- a/config/alfresco/messages/webclient.properties
+++ b/config/alfresco/messages/webclient.properties
@@ -1995,4 +1995,6 @@ ReadPermissions=Read
 SiteManager=Site Manager
 SiteConsumer=Site Consumer
 SiteCollaborator=Site Collaborator
-SiteContributor=Site Contributor
\ No newline at end of file
+SiteContributor=Site Contributor
+sites_space_warning=This space is managed by Alfresco Share. Please use the Alfresco Share application to work with content within this space and any sub-spaces.
+
diff --git a/source/java/org/alfresco/web/bean/BrowseBean.java b/source/java/org/alfresco/web/bean/BrowseBean.java
index 907b6d0cff..22c8f39f1e 100644
--- a/source/java/org/alfresco/web/bean/BrowseBean.java
+++ b/source/java/org/alfresco/web/bean/BrowseBean.java
@@ -24,7 +24,9 @@
  */
 package org.alfresco.web.bean;
 
+import java.io.IOException;
 import java.io.Serializable;
+import java.io.StringWriter;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -37,6 +39,7 @@ import java.util.Set;
 
 import javax.faces.application.NavigationHandler;
 import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
 import javax.faces.event.ActionEvent;
 import javax.transaction.UserTransaction;
 
@@ -46,6 +49,7 @@ import org.alfresco.config.ConfigService;
 import org.alfresco.model.ApplicationModel;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.search.SearcherException;
+import org.alfresco.repo.site.SiteModel;
 import org.alfresco.repo.web.scripts.FileTypeImageUtils;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.dictionary.TypeDefinition;
@@ -81,6 +85,7 @@ import org.alfresco.web.bean.spaces.CreateSpaceWizard;
 import org.alfresco.web.bean.users.UserPreferencesBean;
 import org.alfresco.web.config.ClientConfigElement;
 import org.alfresco.web.config.ViewsConfigElement;
+import org.alfresco.web.ui.common.PanelGenerator;
 import org.alfresco.web.ui.common.Utils;
 import org.alfresco.web.ui.common.Utils.URLMode;
 import org.alfresco.web.ui.common.component.IBreadcrumbHandler;
@@ -648,6 +653,79 @@ public class BrowseBean implements IContextListener, Serializable
       return result;
    }
 
+   /**
+    * Determines whether the current space is a 'Sites' space
+    * 
+    * @return true if the current space is a 'Sites' space
+    */
+   public boolean isSitesSpace()
+   {
+      boolean siteSpace = false;
+      
+      Node currentNode = this.navigator.getCurrentNode();
+      if (currentNode != null)
+      {
+         // check the type of the node to see if it is a 'site' related space
+         QName currentNodeType = currentNode.getType();
+         
+         if (SiteModel.TYPE_SITES.isMatch(currentNodeType) ||
+             SiteModel.TYPE_SITE.isMatch(currentNodeType))
+         {
+            siteSpace = true;
+         }
+      }
+      
+      return siteSpace;
+   }
+   
+   /**
+    * Returns the HTML to display if a space is a 'Sites' space
+    * 
+    * @return The HTML to display
+    */
+   public String getSitesSpaceWarningHTML()
+   {
+      FacesContext context = FacesContext.getCurrentInstance();
+      String contextPath = context.getExternalContext().getRequestContextPath();
+      StringBuilder html = new StringBuilder();
+      
+      try
+      {
+         html.append("<tr valign='top'>");
+         html.append("<td style='background-image: url(");
+         html.append(contextPath);
+         html.append("/images/parts/whitepanel_4.gif)' ");
+         html.append("width='4'></td><td style='padding:4px'>");
+         
+         StringWriter writer = new StringWriter();
+         PanelGenerator.generatePanelStart(writer, contextPath, "yellowInner", "#ffffcc");
+         html.append(writer.toString());
+         
+         html.append("<table cellpadding='0' cellspacing='0' border='0' width='100%'>");
+         html.append("<tr><td valign='top' style='padding-top: 2px' width='20'>");
+         html.append("<img src='");
+         html.append(contextPath);
+         html.append("/images/icons/warning.gif' width='16' height='16' /></td>");
+         html.append("<td class='mainSubText'>");
+         html.append(Application.getMessage(context, "sites_space_warning"));
+         html.append("</td></tr></table>");
+         
+         writer = new StringWriter();
+         PanelGenerator.generatePanelEnd(writer, contextPath, "yellowInner");
+         html.append(writer.toString());
+            
+         html.append("</td><td style='background-image: url(");
+         html.append(contextPath);
+         html.append("/images/parts/whitepanel_6.gif)'"); 
+         html.append("width='4'></td></tr>");
+      }
+      catch (IOException ioe)
+      {
+         logger.error(ioe);
+      }
+      
+      return html.toString();
+   }
 
    /**
     * Setup the common properties required at data-binding time.
diff --git a/source/web/jsp/browse/browse.jsp b/source/web/jsp/browse/browse.jsp
index 4474367181..676d7e142d 100644
--- a/source/web/jsp/browse/browse.jsp
+++ b/source/web/jsp/browse/browse.jsp
@@ -26,6 +26,8 @@
 <%@ page import="org.alfresco.web.app.Application" %>
 <%@ page import="javax.faces.context.FacesContext" %>
 
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator"%>
+
 <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
@@ -205,6 +207,9 @@
                   <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
                   <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width=4 height=9></td>
                </tr>
+
+               <%-- warning message for 'Sites' space --%>
+               <h:outputText id="sites-space-warning" rendered="#{BrowseBean.sitesSpace}" value="#{BrowseBean.sitesSpaceWarningHTML}" escape="false" />
                
                <%-- Custom Template View --%>
                <a:panel id="custom-wrapper-panel" rendered="#{NavigationBean.hasCustomView && NavigationBean.searchContext == null}">