diff --git a/mozilla/content/html/document/src/nsHTMLDocument.cpp b/mozilla/content/html/document/src/nsHTMLDocument.cpp
index 172490993fe..1634edfea5b 100644
--- a/mozilla/content/html/document/src/nsHTMLDocument.cpp
+++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp
@@ -3943,11 +3943,17 @@ nsHTMLDocument::EditingStateChanged()
 
     mScriptsEnabled = tmp;
 
+    rv = docshell->SetAllowJavascript(PR_FALSE);
+    NS_ENSURE_SUCCESS(rv, rv);
+
     rv = docshell->GetAllowPlugins(&tmp);
     NS_ENSURE_SUCCESS(rv, rv);
 
     mPluginsEnabled = tmp;
 
+    rv = docshell->SetAllowPlugins(PR_FALSE);
+    NS_ENSURE_SUCCESS(rv, rv);
+
     updateState = PR_TRUE;
     spellRecheckAll = mEditingState == eContentEditable;
   }