diff --git a/ChangeLog b/ChangeLog
index c4b8b64f60..5b24b72421 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-11  Michael Natterer  <mitch@gimp.org>
+
+	* app/widgets/gimptexteditor.c (gimp_text_editor_new): enable
+	wrapping so the text doesn't scroll out horizontally.
+
 2008-02-11  Sven Neumann  <sven@gimp.org>
 
 	* plug-ins/pygimp/plug-ins/pyconsole.py: formatting.
diff --git a/app/widgets/gimptexteditor.c b/app/widgets/gimptexteditor.c
index 23e3e11b7a..37b2f53faf 100644
--- a/app/widgets/gimptexteditor.c
+++ b/app/widgets/gimptexteditor.c
@@ -205,6 +205,8 @@ gimp_text_editor_new (const gchar     *title,
   gtk_widget_show (scrolled_window);
 
   editor->view = gtk_text_view_new ();
+  gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (editor->view),
+                               GTK_WRAP_WORD_CHAR);
   gtk_container_add (GTK_CONTAINER (scrolled_window), editor->view);
   gtk_widget_show (editor->view);