diff --git a/shell/browser/native_window_mac.mm b/shell/browser/native_window_mac.mm index d36a5500f5c6e..f54fe660f1c4b 100644 --- a/shell/browser/native_window_mac.mm +++ b/shell/browser/native_window_mac.mm @@ -413,7 +413,7 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) { // Use an NSEvent monitor to listen for the wheel event. BOOL __block began = NO; wheel_event_monitor_ = [NSEvent - addLocalMonitorForEventsMatchingMask:NSScrollWheelMask + addLocalMonitorForEventsMatchingMask:NSEventMaskScrollWheel handler:^(NSEvent* event) { if ([[event window] windowNumber] != [window_ windowNumber]) @@ -1657,7 +1657,10 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) { DCHECK(!IsClosed()); ui::NativeTheme::GetInstanceForNativeUi()->RemoveObserver(this); display::Screen::GetScreen()->RemoveObserver(this); - [NSEvent removeMonitor:wheel_event_monitor_]; + if (wheel_event_monitor_) { + [NSEvent removeMonitor:wheel_event_monitor_]; + wheel_event_monitor_ = nil; + } } void NativeWindowMac::OverrideNSWindowContentView() {