diff --git a/mozilla/modules/rdf/src/ht.c b/mozilla/modules/rdf/src/ht.c
index 80b7b39449e..fca0ef14f5f 100644
--- a/mozilla/modules/rdf/src/ht.c
+++ b/mozilla/modules/rdf/src/ht.c
@@ -2206,11 +2206,12 @@ HT_NewCursor (HT_Resource node)
 	{
 		/* determine if container should be auto opened */
 
-		if (node->view->inited == PR_TRUE)		return(NULL);
 		if (node->view->pane->special == PR_TRUE)	return(NULL);
-		if (nlocalStoreHasAssertion(gLocalStore, node->node,
-			gNavCenter->RDF_AutoOpen, "yes",
-			RDF_STRING_TYPE, 1))
+
+		if (node->flags & HT_INITED_FLAG)		return(NULL);
+		node->flags |= HT_INITED_FLAG;
+		if (RDF_HasAssertion(gNCDB, node->node, gNavCenter->RDF_AutoOpen,
+			"yes", RDF_STRING_TYPE, 1))
 		{
 			node->flags |= HT_OPEN_FLAG;
 		}
diff --git a/mozilla/modules/rdf/src/ht.h b/mozilla/modules/rdf/src/ht.h
index 2f9c63cca72..8fa76321edd 100644
--- a/mozilla/modules/rdf/src/ht.h
+++ b/mozilla/modules/rdf/src/ht.h
@@ -143,6 +143,7 @@ typedef	struct _HT_ValueStruct {
 #define	HT_VOLATILE_URL_FLAG	0x0010
 #define	HT_FREEICON_URL_FLAG	0x0020
 #define	HT_PASSWORDOK_FLAG	0x0040
+#define	HT_INITED_FLAG		0x0080
 
 typedef struct _HT_ResourceStruct {
 	struct _HT_ResourceStruct	*nextItem;