diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp
index c768410e3c9..83e64263c74 100644
--- a/mozilla/docshell/base/nsWebShell.cpp
+++ b/mozilla/docshell/base/nsWebShell.cpp
@@ -1274,12 +1274,16 @@ nsWebShell::SetTitle(const PRUnichar* aTitle)
   mTitle = aTitle;
 
   // Title's set on the top level web-shell are passed ont to the container
-  nsIBrowserWindow *browserWindow;
-
-  browserWindow = GetBrowserWindow();
-  if (nsnull != browserWindow) {
-    browserWindow->SetTitle(aTitle);
-    NS_RELEASE(browserWindow);
+  nsIWebShell* parent;
+  GetParent(parent);
+  if (nsnull == parent) {  
+    nsIBrowserWindow *browserWindow = GetBrowserWindow();
+    if (nsnull != browserWindow) {
+      browserWindow->SetTitle(aTitle);
+      NS_RELEASE(browserWindow);
+    }
+  } else {
+    NS_RELEASE(parent);
   }
 
   return NS_OK;
diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp
index c768410e3c9..83e64263c74 100644
--- a/mozilla/webshell/src/nsWebShell.cpp
+++ b/mozilla/webshell/src/nsWebShell.cpp
@@ -1274,12 +1274,16 @@ nsWebShell::SetTitle(const PRUnichar* aTitle)
   mTitle = aTitle;
 
   // Title's set on the top level web-shell are passed ont to the container
-  nsIBrowserWindow *browserWindow;
-
-  browserWindow = GetBrowserWindow();
-  if (nsnull != browserWindow) {
-    browserWindow->SetTitle(aTitle);
-    NS_RELEASE(browserWindow);
+  nsIWebShell* parent;
+  GetParent(parent);
+  if (nsnull == parent) {  
+    nsIBrowserWindow *browserWindow = GetBrowserWindow();
+    if (nsnull != browserWindow) {
+      browserWindow->SetTitle(aTitle);
+      NS_RELEASE(browserWindow);
+    }
+  } else {
+    NS_RELEASE(parent);
   }
 
   return NS_OK;