1 files changed, 4 insertions, 5 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index cf508288616..b85fdb4d71e 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2081,7 +2081,7 @@ remember_mouse_glyph (f, gx, gy, rect)
      int gx, gy;
      NativeRectangle *rect;
 {
-  Lisp_Object window = Qnil;
+  Lisp_Object window;
   struct window *w;
   struct glyph_row *r, *gr, *end_row;
   enum window_part part;
@@ -2091,10 +2091,9 @@ remember_mouse_glyph (f, gx, gy, rect)
   /* Try to determine frame pixel position and size of the glyph under
      frame pixel coordinates X/Y on frame F.  */
 
-  if (f->glyphs_initialized_p)
-    window = window_from_coordinates (f, gx, gy, &part, &x, &y, 0);
-
-  if (NILP (window))
+  if (!f->glyphs_initialized_p
+      || (window = window_from_coordinates (f, gx, gy, &part, &x, &y, 0),
+          NILP (window)))
     {
       width = FRAME_SMALLEST_CHAR_WIDTH (f);
       height = FRAME_SMALLEST_FONT_HEIGHT (f);