diff --git a/embedding/tests/mfcembed/EditorFrm.cpp b/embedding/tests/mfcembed/EditorFrm.cpp
index 30ff444a15a3..62ef62055892 100644
--- a/embedding/tests/mfcembed/EditorFrm.cpp
+++ b/embedding/tests/mfcembed/EditorFrm.cpp
@@ -262,20 +262,26 @@ CEditorFrame::MakeEditable()
 NS_METHOD
 CEditorFrame::DoCommand(const char *aCommand, nsICommandParams *aCommandParams)
 {
-    return mCommandManager ? mCommandManager->DoCommand(aCommand, aCommandParams, nsnull) : NS_ERROR_FAILURE;
+    nsCOMPtr<nsIDOMWindow> domWindow;
+    m_wndBrowserView.mWebBrowser->GetContentDOMWindow(getter_AddRefs(domWindow));
+    return mCommandManager ? mCommandManager->DoCommand(aCommand, aCommandParams, domWindow) : NS_ERROR_FAILURE;
 }
 
 NS_METHOD
 CEditorFrame::IsCommandEnabled(const char *aCommand, PRBool *retval)
 {
-    return mCommandManager ? mCommandManager->IsCommandEnabled(aCommand, nsnull, retval) : NS_ERROR_FAILURE;
+    nsCOMPtr<nsIDOMWindow> domWindow;
+    m_wndBrowserView.mWebBrowser->GetContentDOMWindow(getter_AddRefs(domWindow));
+    return mCommandManager ? mCommandManager->IsCommandEnabled(aCommand, domWindow, retval) : NS_ERROR_FAILURE;
 }
 
 
 NS_METHOD
 CEditorFrame::GetCommandState(const char *aCommand, nsICommandParams *aCommandParams)
 {
-    return mCommandManager ? mCommandManager->GetCommandState(aCommand,nsnull,aCommandParams) : NS_ERROR_FAILURE;
+    nsCOMPtr<nsIDOMWindow> domWindow;
+    m_wndBrowserView.mWebBrowser->GetContentDOMWindow(getter_AddRefs(domWindow));
+    return mCommandManager ? mCommandManager->GetCommandState(aCommand, domWindow, aCommandParams) : NS_ERROR_FAILURE;
 }
 
 NS_METHOD