diff --git a/mozilla/editor/ui/composer/content/editor.js b/mozilla/editor/ui/composer/content/editor.js
index 231242879f6..2da0f388c42 100644
--- a/mozilla/editor/ui/composer/content/editor.js
+++ b/mozilla/editor/ui/composer/content/editor.js
@@ -1250,8 +1250,6 @@ function SetDisplayMode(mode)
         gFormatToolbar.setAttribute("hidden", "true");
       }
 
-      // update commands to disable stuff
-      window.updateCommands("mode_switch");
       gSourceContentWindow.focus();
     }
     else
@@ -1265,12 +1263,12 @@ function SetDisplayMode(mode)
         gFormatToolbar.setAttribute("hidden", gFormatToolbarHidden);
       }
 
-      // update commands to re-enable stuff
-      window.updateCommands("mode_switch");
-
       gContentWindow.focus();
     }
 
+    // update commands to disable or re-enable stuff
+    window.updateCommands("mode_switch");
+
     // We must set check on menu item since toolbar may have been used
     document.getElementById("viewPreviewMode").setAttribute("checked","false");
     document.getElementById("viewNormalMode").setAttribute("checked","false");