diff --git a/mozilla/editor/base/nsComposerCommands.cpp b/mozilla/editor/base/nsComposerCommands.cpp
index 956ce18bfa2..9c210873d17 100644
--- a/mozilla/editor/base/nsComposerCommands.cpp
+++ b/mozilla/editor/base/nsComposerCommands.cpp
@@ -141,7 +141,10 @@ nsBaseStateUpdatingCommand::DoCommand(const PRUnichar *aCommand, nsISupports * r
   nsCOMPtr<nsIEditorShell> editorShell = do_QueryInterface(refCon);
   if (!editorShell) return NS_ERROR_NOT_INITIALIZED;
 
-  return ToggleState(editorShell, mTagName);
+  nsresult rv = ToggleState(editorShell, mTagName);
+  if (NS_FAILED(rv)) return rv;
+  
+  return UpdateCommandState(aCommand, refCon);
 }
 
 NS_IMETHODIMP
diff --git a/mozilla/editor/composer/src/nsComposerCommands.cpp b/mozilla/editor/composer/src/nsComposerCommands.cpp
index 956ce18bfa2..9c210873d17 100644
--- a/mozilla/editor/composer/src/nsComposerCommands.cpp
+++ b/mozilla/editor/composer/src/nsComposerCommands.cpp
@@ -141,7 +141,10 @@ nsBaseStateUpdatingCommand::DoCommand(const PRUnichar *aCommand, nsISupports * r
   nsCOMPtr<nsIEditorShell> editorShell = do_QueryInterface(refCon);
   if (!editorShell) return NS_ERROR_NOT_INITIALIZED;
 
-  return ToggleState(editorShell, mTagName);
+  nsresult rv = ToggleState(editorShell, mTagName);
+  if (NS_FAILED(rv)) return rv;
+  
+  return UpdateCommandState(aCommand, refCon);
 }
 
 NS_IMETHODIMP