diff --git a/mozilla/rdf/tests/domds/nsRDFDOMDataSource.cpp b/mozilla/rdf/tests/domds/nsRDFDOMDataSource.cpp
index e7515c71ee3..b52041a6870 100644
--- a/mozilla/rdf/tests/domds/nsRDFDOMDataSource.cpp
+++ b/mozilla/rdf/tests/domds/nsRDFDOMDataSource.cpp
@@ -267,7 +267,11 @@ nsRDFDOMDataSource::GetTargets(nsIRDFResource *aSource, nsIRDFResource *aPropert
   
   // what node is this?
   if (aSource == kNC_DOMRoot) {
-    rv = getTargetsForKnownObject(mRootFrame, aProperty, PR_TRUE, arcs);
+    nsStringKey frameMode("frame");
+    if (mModeTable.Get(&frameMode))
+      rv = getTargetsForKnownObject(mRootFrame, aProperty, PR_TRUE, arcs);
+    else
+      rv = getTargetsForKnownObject(mDocument, aProperty, PR_TRUE, arcs);
   } else {
     nsCOMPtr<nsIDOMViewerElement> nodeContainer;
     nodeContainer = do_QueryInterface(aSource, &rv);
diff --git a/mozilla/rdf/tests/domds/resources/DOMDataSourceViewer.xul b/mozilla/rdf/tests/domds/resources/DOMDataSourceViewer.xul
index d95418b73ac..93e7c4c7890 100644
--- a/mozilla/rdf/tests/domds/resources/DOMDataSourceViewer.xul
+++ b/mozilla/rdf/tests/domds/resources/DOMDataSourceViewer.xul
@@ -19,6 +19,7 @@
     Content
     <html:input type="checkbox" onclick="setMode('dom', !event.target.checked);"/>
     DOM
+    <html:input type="checkbox" onclick="setMode('frame', !event.target.checked);"/> Frames
     <html:input type="checkbox" onclick="setMode('leaf', !event.target.checked);"/>
     OOB data
   </html:div>