diff --git a/src/ChangeLog b/src/ChangeLog
index c164c6b5f58..4c564d214de 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-13  Eli Zaretskii  <eliz@gnu.org>
+
+	* xdisp.c (handle_invisible_prop): Don't call bidi_paragraph_init
+	when at ZV.  (Bug#8487)
+
 2011-04-11  Eli Zaretskii  <eliz@gnu.org>
 
 	* xdisp.c (redisplay_window): Don't try to determine the character
diff --git a/src/xdisp.c b/src/xdisp.c
index 2b032bd6597..1cf58edc4c6 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3661,7 +3661,7 @@ handle_invisible_prop (struct it *it)
 		 _after_ bidi iteration avoids affecting the visual
 		 order of the displayed text when invisible properties
 		 are added or removed.  */
-	      if (it->bidi_it.first_elt)
+	      if (it->bidi_it.first_elt && it->bidi_it.charpos < ZV)
 		{
 		  /* If we were `reseat'ed to a new paragraph,
 		     determine the paragraph base direction.  We need