diff --git a/src/w32term.c b/src/w32term.c
index 7d530e7ea65..f0ef42f798b 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -4260,7 +4260,8 @@ w32_read_socket (sd, expected, hold_quit)
 
 	  if (f && !f->iconified)
 	    {
-	      if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight))
+	      if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight)
+		  && !EQ (f->tool_bar_window, dpyinfo->mouse_face_window))
 		{
 		  clear_mouse_face (dpyinfo);
 		  dpyinfo->mouse_face_hidden = 1;
@@ -4283,7 +4284,8 @@ w32_read_socket (sd, expected, hold_quit)
 
 	  if (f && !f->iconified)
 	    {
-	      if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight))
+	      if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight)
+		  && !EQ (f->tool_bar_window, dpyinfo->mouse_face_window))
 		{
 		  clear_mouse_face (dpyinfo);
 		  dpyinfo->mouse_face_hidden = 1;