diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp
index 416cc546773..851d9cb4dad 100644
--- a/mozilla/docshell/base/nsDocShell.cpp
+++ b/mozilla/docshell/base/nsDocShell.cpp
@@ -2165,10 +2165,14 @@ NS_IMETHODIMP nsDocShell::LoadHistoryEntry(nsISHEntry* aEntry)
 NS_IMETHODIMP nsDocShell::ShouldAddToGlobalHistory(nsIURI* aURI, 
    PRBool* aShouldAdd)
 {
-   *aShouldAdd = PR_TRUE;
+   if(typeContent == mItemType)
+      {
+      *aShouldAdd = PR_TRUE;
+      return NS_OK;
+      }
+
+   *aShouldAdd = PR_FALSE;
 
-   //XXX Should add code here for things we don't want added to global
-   // history
    return NS_OK;
 }