diff --git a/src/ChangeLog b/src/ChangeLog
index 5f4b3a9e7a7..a7bfd9b7d22 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-18  Eli Zaretskii  <eliz@gnu.org>
+
+	* xdisp.c (reseat_at_next_visible_line_start): Fix last change.
+
 2011-09-18  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Fix minor problem found by static checking.
diff --git a/src/xdisp.c b/src/xdisp.c
index fbf30092ca1..f4e26bf68b6 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5812,7 +5812,7 @@ reseat_at_next_visible_line_start (struct it *it, int on_newline_p)
   else if (skipped_p)
     {
       reseat (it, it->current.pos, 0);
-      if (it->bidi_p)
+      if (it->bidi_p && !STRINGP (it->string))
 	{
 	  it->bidi_it.new_paragraph = new_paragraph;
 	  it->bidi_it.first_elt = first_elt;