diff --git a/mozilla/embedding/browser/activex/src/control/IOleCommandTargetImpl.h b/mozilla/embedding/browser/activex/src/control/IOleCommandTargetImpl.h
index 910cb0cc554..0c949e85106 100644
--- a/mozilla/embedding/browser/activex/src/control/IOleCommandTargetImpl.h
+++ b/mozilla/embedding/browser/activex/src/control/IOleCommandTargetImpl.h
@@ -224,7 +224,8 @@ public:
 			{
 				pCI->pfnCommandProc(pT, pCI->pCmdGUID, pCI->nCmdID, nCmdexecopt, pvaIn, pvaOut);
 			}
-			else if (pCI->nWindowsCmdID != 0)
+			else if (pCI->nWindowsCmdID != 0 &&
+                     !(nCmdexecopt & OLECMDEXECOPT_SHOWHELP))
 			{
 				HWND hwndTarget = pT->GetCommandTargetWindow();
 				if (hwndTarget)
diff --git a/mozilla/embedding/browser/activex/src/control/WebBrowserContainer.cpp b/mozilla/embedding/browser/activex/src/control/WebBrowserContainer.cpp
index 7ca9fe3bd13..e2474f427e0 100644
--- a/mozilla/embedding/browser/activex/src/control/WebBrowserContainer.cpp
+++ b/mozilla/embedding/browser/activex/src/control/WebBrowserContainer.cpp
@@ -479,14 +479,31 @@ CWebBrowserContainer::SetFocus(void)
 NS_IMETHODIMP 
 CWebBrowserContainer::GetTitle(PRUnichar * *aTitle)
 {
-	return NS_ERROR_FAILURE;
+    NG_ASSERT_POINTER(aTitle, PRUnichar **);
+    if (!aTitle)
+        return E_INVALIDARG;
+
+    *aTitle = m_sTitle.ToNewUnicode();
+
+    return NS_OK;
 }
 
 
 NS_IMETHODIMP 
 CWebBrowserContainer::SetTitle(const PRUnichar * aTitle)
 {
-	return NS_ERROR_FAILURE;
+    NG_ASSERT_POINTER(aTitle, PRUnichar *);
+    if (!aTitle)
+        return E_INVALIDARG;
+
+    m_sTitle = aTitle;
+    // Fire a TitleChange event
+    BSTR bstrTitle = SysAllocString(aTitle);
+    m_pEvents1->Fire_TitleChange(bstrTitle);
+    m_pEvents2->Fire_TitleChange(bstrTitle);
+    SysFreeString(bstrTitle);
+
+    return NS_OK;
 }