diff --git a/ChangeLog b/ChangeLog
index a8b7cc8d24..e516579dbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-12  Sven Neumann  <sven@gimp.org>
+
+	* app/tools/gimptexttool.c (gimp_text_tool_editor): always connect
+	the "text_changed" signal so text layers can be edited again.
+
 2004-03-12  Sven Neumann  <sven@gimp.org>
 
 	* app/gui/tool-options-menu.c (tool_options_menu_entries): added
diff --git a/app/tools/gimptexttool.c b/app/tools/gimptexttool.c
index b7d128ab4a..78449b1fa9 100644
--- a/app/tools/gimptexttool.c
+++ b/app/tools/gimptexttool.c
@@ -407,12 +407,13 @@ gimp_text_tool_editor (GimpTextTool *text_tool)
                                    "gimp-text-tool-dialog",
                                    text_tool->editor);
 
-  if (! text_tool->text)
-    {
-      g_signal_connect_object (text_tool->editor, "text_changed",
-                               G_CALLBACK (gimp_text_tool_text_changed),
-                               text_tool, 0);
-    }
+  if (text_tool->text)
+    gimp_text_editor_set_text (GIMP_TEXT_EDITOR (text_tool->editor),
+                               text_tool->text->text, -1);
+
+  g_signal_connect_object (text_tool->editor, "text_changed",
+                           G_CALLBACK (gimp_text_tool_text_changed),
+                           text_tool, 0);
 
   gtk_widget_show (text_tool->editor);
 }