diff --git a/src/ChangeLog b/src/ChangeLog
index ceb9cad4d88..25182378fd0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-30  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* xdisp.c (note_mouse_highlight): Don't do highlight if pointer is
+	invisible (Bug#5766).
+
 2010-03-29  Adrian Robert  <adrian.b.robert@gmail.com>
 
 	* xdisp.c (x_consider_frame_title, update_window_cursor): Remove
diff --git a/src/xdisp.c b/src/xdisp.c
index 81b97b25c1c..1b6cbfbe27a 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -23551,7 +23551,8 @@ note_mouse_highlight (f, x, y)
 #endif
 
   if (NILP (Vmouse_highlight)
-      || !f->glyphs_initialized_p)
+      || !f->glyphs_initialized_p
+      || f->pointer_invisible)
     return;
 
   dpyinfo->mouse_face_mouse_x = x;