diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm
index 1475e53f1c1f..0e96c09b9140 100644
--- a/atom/browser/native_window_mac.mm
+++ b/atom/browser/native_window_mac.mm
@@ -604,8 +604,10 @@ bool NativeWindowMac::IsWithinDraggableRegion(NSPoint point) const {
 }
 
 void NativeWindowMac::HandleMouseEvent(NSEvent* event) {
-  NSPoint current_mouse_location =
-      [window_ convertBaseToScreen:[event locationInWindow]];
+  NSPoint eventLoc = [event locationInWindow];
+  NSRect mouseRect = [window_ convertRectToScreen:NSMakeRect(eventLoc.x, eventLoc.y, 0, 0)];
+  NSPoint current_mouse_location = mouseRect.origin;
+
 
   if ([event type] == NSLeftMouseDown) {
     NSPoint frame_origin = [window_ frame].origin;
diff --git a/atom/browser/ui/cocoa/event_processing_window.mm b/atom/browser/ui/cocoa/event_processing_window.mm
index ed22592b376f..e58477d7efda 100644
--- a/atom/browser/ui/cocoa/event_processing_window.mm
+++ b/atom/browser/ui/cocoa/event_processing_window.mm
@@ -58,8 +58,8 @@
   // Convert the event's location from the original window's coordinates into
   // our own.
   NSPoint eventLoc = [event locationInWindow];
-  eventLoc = [[event window] convertBaseToScreen:eventLoc];
-  eventLoc = [self convertScreenToBase:eventLoc];
+  eventLoc = [self convertRectFromScreen:
+    [[event window] convertRectToScreen:NSMakeRect(eventLoc.x, eventLoc.y, 0, 0)]].origin;
 
   // Various things *only* apply to key down/up.
   BOOL eventIsARepeat = NO;