diff --git a/editor/libeditor/base/nsEditor.cpp b/editor/libeditor/base/nsEditor.cpp
index e84206843ca..6b8383b10b3 100644
--- a/editor/libeditor/base/nsEditor.cpp
+++ b/editor/libeditor/base/nsEditor.cpp
@@ -163,6 +163,8 @@ nsEditor::nsEditor()
 
 nsEditor::~nsEditor()
 {
+  NS_ASSERTION(!mDocWeak || mDidPreDestroy, "Why PreDestroy hasn't been called?");
+
   mTxnMgr = nsnull;
 
   delete mPhonetic;
diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp
index 79479b696df..ceb1849527b 100644
--- a/layout/forms/nsTextControlFrame.cpp
+++ b/layout/forms/nsTextControlFrame.cpp
@@ -1023,6 +1023,12 @@ nsTextControlFrame::PreDestroy()
       // (now that mUseEditor is false values get stored
       // in content).
       SetValue(value);
+
+      // Reset mUseEditor for now, so that if any of the rest of the operation
+      // leads to an attempt at getting the editor, lazy initialization doesn't
+      // kick in.  See bug 557689 for an example of the types of problems this
+      // prevents.
+      mUseEditor = PR_TRUE;
     }
     mEditor->PreDestroy(PR_TRUE);
   }
@@ -1064,6 +1070,7 @@ nsTextControlFrame::PreDestroy()
     }
   }
 
+  mUseEditor = PR_FALSE;
   mEditor = nsnull;
   if (mSelCon) {
     mSelCon->SetScrollableFrame(nsnull);