diff --git a/ChangeLog b/ChangeLog
index a235fbc059..054d32eed5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-01-12  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtktextview.c (gtk_text_view_commit_text) 
+	(gtk_text_view_delete_from_cursor, gtk_text_view_backspace): 
+	Reset the virtual cursor position.  (#326003, Evert Verhellen)
+
 	* gtk/gtkwidget.c (gtk_widget_set_app_paintable): Add some docs
 	about RGBA windows. (#326486, Benjamin Otte)
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a235fbc059..054d32eed5 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2006-01-12  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtktextview.c (gtk_text_view_commit_text) 
+	(gtk_text_view_delete_from_cursor, gtk_text_view_backspace): 
+	Reset the virtual cursor position.  (#326003, Evert Verhellen)
+
 	* gtk/gtkwidget.c (gtk_widget_set_app_paintable): Add some docs
 	about RGBA windows. (#326486, Benjamin Otte)
 
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 7804fcfad6..e36b5b15cd 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -5214,6 +5214,7 @@ gtk_text_view_delete_from_cursor (GtkTextView   *text_view,
         }
 
       gtk_text_buffer_end_user_action (get_buffer (text_view));
+      gtk_text_view_set_virtual_cursor_pos (text_view, -1, -1);
 
       DV(g_print (G_STRLOC": scrolling onscreen\n"));
       gtk_text_view_scroll_mark_onscreen (text_view,
@@ -5241,6 +5242,7 @@ gtk_text_view_backspace (GtkTextView *text_view)
   if (gtk_text_buffer_backspace (get_buffer (text_view), &insert,
 				 TRUE, text_view->editable))
     {
+      gtk_text_view_set_virtual_cursor_pos (text_view, -1, -1);
       DV(g_print (G_STRLOC": scrolling onscreen\n"));
       gtk_text_view_scroll_mark_onscreen (text_view,
 					  gtk_text_buffer_get_mark (get_buffer (text_view), "insert"));
@@ -6726,6 +6728,7 @@ gtk_text_view_commit_text (GtkTextView   *text_view,
 
   gtk_text_buffer_end_user_action (get_buffer (text_view));
 
+  gtk_text_view_set_virtual_cursor_pos (text_view, -1, -1);
   DV(g_print (G_STRLOC": scrolling onscreen\n"));
   gtk_text_view_scroll_mark_onscreen (text_view,
                                       gtk_text_buffer_get_mark (get_buffer (text_view),