Index: src/java/org/sakaiproject/search/tool/SearchBeanImpl.java
===================================================================
--- src/java/org/sakaiproject/search/tool/SearchBeanImpl.java	(revision 32895)
+++ src/java/org/sakaiproject/search/tool/SearchBeanImpl.java	(working copy)
@@ -464,6 +464,10 @@
 		
 		if (toolPropertySiteIds == null) return l;
 		
+		// search all user worksites if in My Workspace
+		if ( siteService.isUserSite(this.siteId) )
+			l.addAll( getUserSearchSites() );
+		
 		//String[] searchSiteIds = extractSiteIdsFromToolProperty(extractPropertiesFromTool());
 		String[] searchSiteIds = toolPropertySiteIds;
 
@@ -476,6 +480,25 @@
 		return l;
 	}
 
+	/**
+	 ** Return list of worksite Ids for current user
+	 **/
+	protected List getUserSearchSites()
+	{		 
+		List siteList = siteService.getSites(SiteService.SelectionType.ACCESS,
+														 null, null, null, 
+														 SiteService.SortType.TITLE_ASC, null);
+		List siteStrIds = new ArrayList(siteList.size());
+		for (Iterator it = siteList.iterator(); it.hasNext();) 
+		{
+			Site site = (Site) it.next();
+			String siteId = site.getId();
+			siteStrIds.add( siteId );
+		}
+		
+		return siteStrIds;
+	}
+
 	protected String[] getToolPropertySiteIds() {
 		Properties props = extractPropertiesFromTool();
 		String[] searchSiteIds = extractSiteIdsFromProperties(props);