Index: src/video/cocoa/wnd_quartz.mm
===================================================================
--- src/video/cocoa/wnd_quartz.mm	(revision 24953)
+++ src/video/cocoa/wnd_quartz.mm	(working copy)
@@ -513,9 +513,17 @@
 
 NSPoint WindowQuartzSubdriver::GetMouseLocation(NSEvent *event)
 {
-	NSPoint pt = [ event locationInWindow ];
-	pt = [ this->cocoaview convertPoint:pt fromView:nil ];
+	NSPoint pt;
 
+	if (event.window == nil)
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7)
+		pt = [ this->cocoaview convertPoint: [ [ this->cocoaview window ] convertRectFromScreen: NSMakeRect([ event locationInWindow ].x, [ event locationInWindow ].y, 0, 0) ].origin fromView: nil ];
+#else
+		pt = [ this->cocoaview convertPoint: [ [ this->cocoaview window ] convertScreenToBase: [ event locationInWindow ] ] fromView: nil ];
+#endif
+	else
+		pt = [ event locationInWindow ];
+
 	pt.y = this->window_height - pt.y;
 
 	return pt;