diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 59485017eb..e336343b83 100644
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -553,13 +553,13 @@ void wxTextCtrl::WriteText( const wxString &text )
 #endif
         GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
         
-        // TODO: call wahtever is needed to delete the selection
+        // TODO: Call whatever is needed to delete the selection.
         gtk_text_buffer_insert_at_cursor( text_buffer, buffer, strlen(buffer) );
-        
+
+        // Scroll to cursor.
         GtkTextIter iter;
-        gtk_text_buffer_get_iter_at_mark( text_buffer, &iter,
-                                         gtk_text_buffer_get_mark (text_buffer, "insert") );
-        gtk_text_view_scroll_to_iter( GTK_TEXT_VIEW(m_text), &iter, 0.0, FALSE, 0.0, 0.0 );
+        gtk_text_buffer_get_iter_at_mark( text_buffer, &iter,  gtk_text_buffer_get_insert( text_buffer ) );
+        gtk_text_view_scroll_to_iter( GTK_TEXT_VIEW(m_text), &iter, 0.0, FALSE, 0.0, 1.0 );
 
 #else // GTK 1.x
         // After cursor movements, gtk_text_get_point() is wrong by one.
diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index 59485017eb..e336343b83 100644
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -553,13 +553,13 @@ void wxTextCtrl::WriteText( const wxString &text )
 #endif
         GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
         
-        // TODO: call wahtever is needed to delete the selection
+        // TODO: Call whatever is needed to delete the selection.
         gtk_text_buffer_insert_at_cursor( text_buffer, buffer, strlen(buffer) );
-        
+
+        // Scroll to cursor.
         GtkTextIter iter;
-        gtk_text_buffer_get_iter_at_mark( text_buffer, &iter,
-                                         gtk_text_buffer_get_mark (text_buffer, "insert") );
-        gtk_text_view_scroll_to_iter( GTK_TEXT_VIEW(m_text), &iter, 0.0, FALSE, 0.0, 0.0 );
+        gtk_text_buffer_get_iter_at_mark( text_buffer, &iter,  gtk_text_buffer_get_insert( text_buffer ) );
+        gtk_text_view_scroll_to_iter( GTK_TEXT_VIEW(m_text), &iter, 0.0, FALSE, 0.0, 1.0 );
 
 #else // GTK 1.x
         // After cursor movements, gtk_text_get_point() is wrong by one.