From 8809bef4280a1b98996825a83e2a7f9a5802fd0a Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Sun, 2 Aug 2009 00:12:29 +0200
Subject: [PATCH] mshtml: Call set_ns_editmode in better place.

---
 dlls/mshtml/olecmd.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c
index a122e0cb089..a8d3e6a95e9 100644
--- a/dlls/mshtml/olecmd.c
+++ b/dlls/mshtml/olecmd.c
@@ -583,9 +583,6 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in,
                     debugstr_w(hostinfo.pchHostCss), debugstr_w(hostinfo.pchHostNS));
     }
 
-    if(This->nscontainer)
-        set_ns_editmode(This->nscontainer);
-
     update_doc(This, UPDATE_UI);
 
     if(This->mon) {
@@ -610,12 +607,17 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in,
         return hres;
 
     if(This->ui_active) {
-        RECT rcBorderWidths;
-
         if(This->ip_window)
             call_set_active_object(This->ip_window, NULL);
         if(This->hostui)
             IDocHostUIHandler_HideUI(This->hostui);
+    }
+
+    if(This->nscontainer)
+        set_ns_editmode(This->nscontainer);
+
+    if(This->ui_active) {
+        RECT rcBorderWidths;
 
         if(This->hostui)
             IDocHostUIHandler_ShowUI(This->hostui, DOCHOSTUITYPE_AUTHOR, ACTOBJ(This), CMDTARGET(This),