1 files changed, 4 insertions, 1 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index ab3aae5fb91..33317f4c491 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3428,7 +3428,7 @@ handle_display_prop (it)
     }
   else
     {
-      object = it->w->buffer;
+      XSETWINDOW (object, it->w);
       position = &it->current.pos;
     }
 
@@ -3449,6 +3449,9 @@ handle_display_prop (it)
   if (NILP (prop))
     return HANDLED_NORMALLY;
 
+  if (!STRINGP (it->string))
+    object = it->w->buffer;
+
   if (CONSP (prop)
       /* Simple properties.  */
       && !EQ (XCAR (prop), Qimage)