diff --git a/mailnews/compose/resources/content/MsgComposeCommands.js b/mailnews/compose/resources/content/MsgComposeCommands.js
index 5212bc861aa..a25df5f45ea 100644
--- a/mailnews/compose/resources/content/MsgComposeCommands.js
+++ b/mailnews/compose/resources/content/MsgComposeCommands.js
@@ -698,8 +698,8 @@ function ComposeStartup()
 			msgCompose.editor = window.editorShell;
 			
 			//We need to unregister some of the editor commands to avoid conflict
-			if (gComposerCommandManager)
-			  gComposerCommandManager.unregisterCommand("cmd_preferences", nsPreferencesCommand);
+			if (gHTMLEditorCommandManager)
+			  gHTMLEditorCommandManager.unregisterCommand("cmd_preferences", nsPreferencesCommand);
 
 			msgCompose.RegisterStateListener(stateListener);