diff --git a/mozilla/editor/base/nsInterfaceState.cpp b/mozilla/editor/base/nsInterfaceState.cpp
index 588e7dc2211..e517a8bb04d 100644
--- a/mozilla/editor/base/nsInterfaceState.cpp
+++ b/mozilla/editor/base/nsInterfaceState.cpp
@@ -64,9 +64,6 @@ nsInterfaceState::nsInterfaceState()
 
 nsInterfaceState::~nsInterfaceState()
 {
-  // cancel any outstanding udpate timer
-  if (mUpdateTimer)
-    mUpdateTimer->Cancel();
 }
 
 NS_IMPL_ADDREF(nsInterfaceState);
@@ -103,6 +100,10 @@ nsInterfaceState::TableCellNotification(nsIDOMNode* aNode, PRInt32 aOffset)
 NS_IMETHODIMP
 nsInterfaceState::NotifyDocumentWillBeDestroyed()
 {
+  // cancel any outstanding udpate timer
+  if (mUpdateTimer)
+    mUpdateTimer->Cancel();
+
   return NS_OK;
 }
 
diff --git a/mozilla/editor/composer/src/nsInterfaceState.cpp b/mozilla/editor/composer/src/nsInterfaceState.cpp
index 588e7dc2211..e517a8bb04d 100644
--- a/mozilla/editor/composer/src/nsInterfaceState.cpp
+++ b/mozilla/editor/composer/src/nsInterfaceState.cpp
@@ -64,9 +64,6 @@ nsInterfaceState::nsInterfaceState()
 
 nsInterfaceState::~nsInterfaceState()
 {
-  // cancel any outstanding udpate timer
-  if (mUpdateTimer)
-    mUpdateTimer->Cancel();
 }
 
 NS_IMPL_ADDREF(nsInterfaceState);
@@ -103,6 +100,10 @@ nsInterfaceState::TableCellNotification(nsIDOMNode* aNode, PRInt32 aOffset)
 NS_IMETHODIMP
 nsInterfaceState::NotifyDocumentWillBeDestroyed()
 {
+  // cancel any outstanding udpate timer
+  if (mUpdateTimer)
+    mUpdateTimer->Cancel();
+
   return NS_OK;
 }