diff --git a/mozilla/widget/src/gtk2/nsWindow.cpp b/mozilla/widget/src/gtk2/nsWindow.cpp
index 5e63dde6619..875dd204629 100644
--- a/mozilla/widget/src/gtk2/nsWindow.cpp
+++ b/mozilla/widget/src/gtk2/nsWindow.cpp
@@ -1841,7 +1841,10 @@ nsWindow::OnDragDropEvent(GtkWidget *aWidget,
 
     // clear any drag leave timer that might be pending so that it
     // doesn't get processed when we actually go out to get data.
-    mDragLeaveTimer = 0;
+    if (mDragLeaveTimer) {
+        mDragLeaveTimer->Cancel();
+        mDragLeaveTimer = 0;
+    }
 
     // set the last window to this
     mLastDragMotionWindow = innerMostWidget;