diff --git a/src/video/cocoa/cocoa_v.h b/src/video/cocoa/cocoa_v.h
index 9f7f55c7ce..06bbbfdb2a 100644
--- a/src/video/cocoa/cocoa_v.h
+++ b/src/video/cocoa/cocoa_v.h
@@ -253,6 +253,7 @@ uint QZ_ListModes(OTTD_Point *modes, uint max_modes, CGDirectDisplayID display_i
 - (void)setDriver:(CocoaSubdriver*)drv;
 
 - (BOOL)windowShouldClose:(id)sender;
+- (void)windowDidEnterFullScreen:(NSNotification *)aNotification;
 @end
 
 
diff --git a/src/video/cocoa/cocoa_v.mm b/src/video/cocoa/cocoa_v.mm
index 9e883928bc..ca81715b18 100644
--- a/src/video/cocoa/cocoa_v.mm
+++ b/src/video/cocoa/cocoa_v.mm
@@ -776,6 +776,14 @@ void cocoaReleaseAutoreleasePool()
 {
 	driver->active = false;
 }
+/** Window entered fullscreen mode (10.7). */
+- (void)windowDidEnterFullScreen:(NSNotification *)aNotification
+{
+	NSPoint loc = [ driver->cocoaview convertPoint:[ [ aNotification object ] mouseLocationOutsideOfEventStream ] fromView:nil ];
+	BOOL inside = ([ driver->cocoaview hitTest:loc ] == driver->cocoaview);
+
+	if (inside) [ driver->cocoaview mouseEntered:NULL ];
+}
 
 @end