diff --git a/mozilla/suite/browser/src/nsInternetSearchService.cpp b/mozilla/suite/browser/src/nsInternetSearchService.cpp
index bbe33927ee8..1392f319b7d 100755
--- a/mozilla/suite/browser/src/nsInternetSearchService.cpp
+++ b/mozilla/suite/browser/src/nsInternetSearchService.cpp
@@ -617,6 +617,14 @@ InternetSearchDataSource::GetTarget(nsIRDFResource *source,
 		if (NS_FAILED(rv))	return(rv);
 		source = trueEngine;
 	}
+	
+	if (isSearchURI(source) && (property == kNC_Child))
+	{
+		// fake out the generic builder (i.e. return anything in this case)
+		// so that search containers never appear to be empty
+		*target = source;
+		return(NS_OK);
+	}
 
 	if (mInner)
 	{
diff --git a/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp b/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp
index bbe33927ee8..1392f319b7d 100755
--- a/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp
+++ b/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp
@@ -617,6 +617,14 @@ InternetSearchDataSource::GetTarget(nsIRDFResource *source,
 		if (NS_FAILED(rv))	return(rv);
 		source = trueEngine;
 	}
+	
+	if (isSearchURI(source) && (property == kNC_Child))
+	{
+		// fake out the generic builder (i.e. return anything in this case)
+		// so that search containers never appear to be empty
+		*target = source;
+		return(NS_OK);
+	}
 
 	if (mInner)
 	{