diff --git a/mozilla/editor/ui/composer/content/editor.js b/mozilla/editor/ui/composer/content/editor.js
index b718f4e57ae..660530b28fd 100644
--- a/mozilla/editor/ui/composer/content/editor.js
+++ b/mozilla/editor/ui/composer/content/editor.js
@@ -509,7 +509,7 @@ function EditorSetDocumentCharacterSet(aCharset)
 // ------------------------------------------------------------------
 function updateCharsetPopupMenu(menuPopup)
 {
-  if(editorShell.documentModified)
+  if(editorShell.documentModified && !editorShell.documentIsEmpty)
   {
     for (var i = 0; i < menuPopup.childNodes.length; i++)
     {