diff --git a/Source/NSMenuView.m b/Source/NSMenuView.m
index d15919862..c90ce4f96 100644
--- a/Source/NSMenuView.m
+++ b/Source/NSMenuView.m
@@ -1832,6 +1832,11 @@ - (BOOL) _trackWithEvent: (NSEvent*)event
 					inMode: NSEventTrackingRunLoopMode
 				       dequeue: YES];
 	  type = [event type];
+    if (type == NSLeftMouseUp || type == NSRightMouseUp || type == NSOtherMouseUp)
+      {
+          shouldFinish = YES;
+          break;  // Exit the loop to proceed to StopPeriodicEvents
+      }
 	  if (type == NSAppKitDefined)
 	    {
 	      [[event window] sendEvent: event];