diff --git a/src/nsterm.m b/src/nsterm.m
index ed0e7a2aae8..3727f861ac6 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -3976,6 +3976,19 @@ Function modeled after x_draw_glyph_string_box ().
   NSRect r[2];
   int n;
   char box_drawn_p = 0;
+
+  struct face *face = s->face;
+  if (s->hl == DRAW_MOUSE_FACE)
+    {
+      face
+	= FACE_FROM_ID_OR_NULL (s->f,
+				MOUSE_HL_INFO (s->f)->mouse_face_face_id);
+      if (!face)
+	face = FACE_FROM_ID (s->f, MOUSE_FACE_ID);
+    }
+
+  s->face = face;
+
   struct font *font = s->face->font;
   if (! font) font = FRAME_FONT (s->f);