Index: site-manage/site-manage-tool/tool/src/bundle/membership.properties
===================================================================
--- site-manage/site-manage-tool/tool/src/bundle/membership.properties	(revision 22345)
+++ site-manage/site-manage-tool/tool/src/bundle/membership.properties	(working copy)
@@ -35,6 +35,8 @@
 mb.joinable = Joinable Sites
 mb.listunjoin = The list below includes all sites you currently belong to.
 mb.listjoin = The list below includes sites that can be joined.
+mb.listsearchjoin=The list below includes sites that can be joined matching your search of "
+mb.listsearchjoin2=".
 mb.confirm = Confirm Change
 mb.confirm1=Are you sure you want to unjoin 
 mb.confirm2= site?
@@ -54,6 +56,8 @@
 mb.list.pager.show100=show 100 items...
 mb.list.pager.show200=show 200 items...
 mb.list.nosites=There are no joinable sites at the moment
+mb.list.nosearchsites=There are no joinable sites matching your search of "
+mb.list.nosearchsites2=".
 mb.list.nomembs=You are not a member of any site.
 mb.list.select=Press alt + up and down arrows to scroll through select menu
 
Index: site-manage/site-manage-tool/tool/src/webapp/vm/membership/chef_membership_joinable.vm
===================================================================
--- site-manage/site-manage-tool/tool/src/webapp/vm/membership/chef_membership_joinable.vm	(revision 22345)
+++ site-manage/site-manage-tool/tool/src/webapp/vm/membership/chef_membership_joinable.vm	(working copy)
@@ -13,7 +13,7 @@
 	#if ($alertMessage)<p class="information">$validator.escapeHtml($alertMessage)</p>#end
 	
 
-	#if ($openSites.size()>0)
+	#if ($openSites.size() > 0 || $search.length() > 0)
 	<div class="navPanel">
 		<div class="searchNav">
 			<form name="searchform" method="post" class="inlineForm" action="#toolForm("$action")">
@@ -24,11 +24,17 @@
 			</form> 
 		</div>
 	</div>	
+	#end
 
+	#if ($openSites.size() > 0)
 		<div class="navPanel">
 			<div class="viewNav">
 				<div class="instruction">
+				#if ($search.length() > 0)
+					$tlang.getString("mb.listsearchjoin")${search}$tlang.getString("mb.listsearchjoin2")
+				#else
 					$tlang.getString("mb.listjoin")
+				#end
 				</div>
 			</div>
 			<div class="listNav">
@@ -123,6 +129,8 @@
 				#end	
 			</table>
 		</form>
+	#elseif ($search.length() > 0)
+		<p class="instruction">$tlang.getString('mb.list.nosearchsites')${search}$tlang.getString('mb.list.nosearchsites2')</p>
 	#else
 		<p class="instruction">$tlang.getString('mb.list.nosites')</p>
 	#end