diff --git a/ChangeLog b/ChangeLog
index 6ebb361f9d..0a46d9a556 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-02-18  Matthias Clasen  <mclasen@redhat.com>
+
+	Merged from trunk:
+
+	* gtk/gtktextlayout.c (gtk_text_layout_move_iter_visually):
+	Ignore invisible text when going to end of the previous line.
+	(#382565)
+
 2007-02-16  Kristian Rietveld  <kris@gtk.org>
 
 	Merged from trunk:
diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index 5f62e70304..425b2445cd 100644
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -3189,7 +3189,8 @@ gtk_text_layout_move_iter_visually (GtkTextLayout *layout,
           
  	  gtk_text_layout_free_line_display (layout, display);
  	  display = gtk_text_layout_get_line_display (layout, line, FALSE);
-          new_index = _gtk_text_line_byte_count (line);
+          gtk_text_iter_forward_to_line_end (&lineiter);
+          new_index = gtk_text_iter_get_visible_line_index (&lineiter);
         }
       else if (new_index > byte_count)
         {