diff --git a/ChangeLog b/ChangeLog
index 50be93a66..b6aa1c341 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-17 Adrian Robert <arobert@cogsci.ucsd.edu>
+
+	* Source/NSApplication.m
+	(-nextEventMatchingMask:untilDate:inMode:dequeue:): Check that
+	event is not 'null_event' before using it to unhide mouse.
+
 2005-01-17  Fred Kiefer <FredKiefer@gmx.de>
 
         * Source/NSBrowserCell.m (-setType:): New method, does nothing to
diff --git a/Source/NSApplication.m b/Source/NSApplication.m
index 0eb303bc1..4a34e270b 100644
--- a/Source/NSApplication.m
+++ b/Source/NSApplication.m
@@ -1648,7 +1648,7 @@ IF_NO_GC(NSAssert([event retainCount] > 0, NSInternalInconsistencyException));
        * If we are not in a tracking loop, we may want to unhide a hidden
        * because the mouse has been moved.
        */
-      if (mode != NSEventTrackingRunLoopMode)
+      if (mode != NSEventTrackingRunLoopMode && event != null_event)
 	{
 	  if ([NSCursor isHiddenUntilMouseMoves])
 	    {