diff --git a/src/logic/events/CursorEvents.swift b/src/logic/events/CursorEvents.swift
index 11ef23f4..9b909a59 100644
--- a/src/logic/events/CursorEvents.swift
+++ b/src/logic/events/CursorEvents.swift
@@ -25,7 +25,7 @@ class CursorEvents {
     }
 
     private static func observe_() {
-        let eventMask = [CGEventType.leftMouseDown, CGEventType.leftMouseUp, CGEventType.otherMouseUp, CGEventType.mouseMoved].reduce(CGEventMask(0), { $0 | (1 << $1.rawValue) })
+        let eventMask = [CGEventType.leftMouseDown, CGEventType.leftMouseUp, CGEventType.rightMouseDown, CGEventType.rightMouseUp, CGEventType.otherMouseDown, CGEventType.otherMouseUp, CGEventType.mouseMoved].reduce(CGEventMask(0), { $0 | (1 << $1.rawValue) })
         // CGEvent.tapCreate returns nil if ensureAccessibilityCheckboxIsChecked() didn't pass
         eventTap = CGEvent.tapCreate(
             tap: .cgSessionEventTap,
@@ -48,6 +48,9 @@ class CursorEvents {
         switch type {
             case .leftMouseDown: return handleLeftMouseDown(cgEvent)
             case .leftMouseUp: return handleLeftMouseUp(cgEvent)
+            case .rightMouseDown: return handleRightMouseDown(cgEvent)
+            case .rightMouseUp: return handleRightMouseUp(cgEvent)
+            case .otherMouseDown: return handleOtherMouseDown(cgEvent)
             case .otherMouseUp: return handleOtherMouseUp(cgEvent)
             case .mouseMoved: return handleMouseMoved(cgEvent)
             case .tapDisabledByUserInput, .tapDisabledByTimeout:
@@ -93,15 +96,29 @@ class CursorEvents {
         return nil
     }
 
+    private static func handleRightMouseDown(_ cgEvent: CGEvent) -> Unmanaged<CGEvent>? {
+        if ContextMenuEvents.isMenuOpen || isPointerInsideUi() { return Unmanaged.passUnretained(cgEvent) }
+        return nil
+    }
+
+    private static func handleRightMouseUp(_ cgEvent: CGEvent) -> Unmanaged<CGEvent>? {
+        if ContextMenuEvents.isMenuOpen || isPointerInsideUi() { return Unmanaged.passUnretained(cgEvent) }
+        return nil
+    }
+
+    private static func handleOtherMouseDown(_ cgEvent: CGEvent) -> Unmanaged<CGEvent>? {
+        if ContextMenuEvents.isMenuOpen || isPointerInsideUi() { return Unmanaged.passUnretained(cgEvent) }
+        return nil
+    }
+
     private static func handleOtherMouseUp(_ cgEvent: CGEvent) -> Unmanaged<CGEvent>? {
         if ContextMenuEvents.isMenuOpen { return Unmanaged.passUnretained(cgEvent) }
-        guard isPointerInsideUi(),
-              cgEvent.getIntegerValueField(.mouseEventButtonNumber) == 2,
-              let target = findTileViewUnderPointer(),
-              let window = target.window_ else {
-            return Unmanaged.passUnretained(cgEvent)
+        if isPointerInsideUi(),
+           cgEvent.getIntegerValueField(.mouseEventButtonNumber) == 2,
+           let target = findTileViewUnderPointer(),
+           let window = target.window_ {
+            window.isWindowlessApp ? window.application.quit() : window.close()
         }
-        window.isWindowlessApp ? window.application.quit() : window.close()
         return nil
     }