2 files changed, 4 insertions, 0 deletions
diff --git a/widget/cocoa/MOZMenuOpeningCoordinator.mm b/widget/cocoa/MOZMenuOpeningCoordinator.mm
index 3ac4d8385f..bc78b3778c 100644
--- a/widget/cocoa/MOZMenuOpeningCoordinator.mm
+++ b/widget/cocoa/MOZMenuOpeningCoordinator.mm
@@ -122,6 +122,9 @@ static BOOL sNeedToUnwindForMenuClosing = NO;
 
 - (void)cancelAsynchronousOpening:(NSInteger)aHandle {
   if (mPendingOpening && mPendingOpening.handle == aHandle) {
+    [NSObject cancelPreviousPerformRequestsWithTarget:self
+                                             selector:@selector(_runMenu)
+                                               object:nil];
     [mPendingOpening release];
     mPendingOpening = nil;
   }
diff --git a/widget/nsBaseDragService.cpp b/widget/nsBaseDragService.cpp
index bdd8d2bd28..212038e0e4 100644
--- a/widget/nsBaseDragService.cpp
+++ b/widget/nsBaseDragService.cpp
@@ -632,6 +632,7 @@ nsBaseDragService::EndDragSession(bool aDoneDrag, uint32_t aKeyModifiers) {
   mSourceDocument = nullptr;
   mSourceNode = nullptr;
   mSourceWindowContext = nullptr;
+  mSourceTopWindowContext = nullptr;
   mTriggeringPrincipal = nullptr;
   mCsp = nullptr;
   mSelection = nullptr;